From: Jon Maloy <jon.maloy@ericsson.com>
To: davem@davemloft.net
Cc: Jon Maloy <jon.maloy@ericsson.com>,
netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net
Subject: [PATCH net-next 10/14] tipc: rename stack variables in function tipc_link_tunnel_rcv
Date: Wed, 12 Feb 2014 13:31:10 -0500 [thread overview]
Message-ID: <1392229874-29675-11-git-send-email-jon.maloy@ericsson.com> (raw)
In-Reply-To: <1392229874-29675-1-git-send-email-jon.maloy@ericsson.com>
After the previous redesign of the tunnel reception algorithm and
functions, we finalize it by renaming a couple of stack variables
in tipc_tunnel_rcv(). This makes it more consistent with the naming
scheme elsewhere in this part of the code.
This change is purely cosmetic, with no functional changes.
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
---
net/tipc/link.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 00f529e..758f7cd 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -2176,29 +2176,29 @@ exit:
static int tipc_link_tunnel_rcv(struct tipc_node *n_ptr,
struct sk_buff **buf)
{
- struct sk_buff *tunnel_buf = *buf;
- struct tipc_link *dest_link;
- struct tipc_msg *tunnel_msg = buf_msg(tunnel_buf);
- u32 bearer_id = msg_bearer_id(tunnel_msg);
+ struct sk_buff *t_buf = *buf;
+ struct tipc_link *l_ptr;
+ struct tipc_msg *t_msg = buf_msg(t_buf);
+ u32 bearer_id = msg_bearer_id(t_msg);
*buf = NULL;
if (bearer_id >= MAX_BEARERS)
goto exit;
- dest_link = n_ptr->links[bearer_id];
- if (!dest_link)
+ l_ptr = n_ptr->links[bearer_id];
+ if (!l_ptr)
goto exit;
- if (msg_type(tunnel_msg) == DUPLICATE_MSG)
- tipc_link_dup_rcv(dest_link, tunnel_buf);
- else if (msg_type(tunnel_msg) == ORIGINAL_MSG)
- *buf = tipc_link_failover_rcv(dest_link, tunnel_buf);
+ if (msg_type(t_msg) == DUPLICATE_MSG)
+ tipc_link_dup_rcv(l_ptr, t_buf);
+ else if (msg_type(t_msg) == ORIGINAL_MSG)
+ *buf = tipc_link_failover_rcv(l_ptr, t_buf);
else
pr_warn("%sunknown tunnel pkt received\n", link_co_err);
exit:
- kfree_skb(tunnel_buf);
+ kfree_skb(t_buf);
return *buf != NULL;
}
--
1.7.9.5
------------------------------------------------------------------------------
Android apps run on BlackBerry 10
Introducing the new BlackBerry 10.2.1 Runtime for Android apps.
Now with support for Jelly Bean, Bluetooth, Mapview and more.
Get your Android app in front of a whole new audience. Start now.
http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk
next prev parent reply other threads:[~2014-02-12 18:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-12 18:31 [PATCH net-next 00/14] tipc: clean up media and bearer layer Jon Maloy
2014-02-12 18:31 ` [PATCH net-next 01/14] tipc: stricter behavior of message reassembly function Jon Maloy
2014-02-12 18:31 ` [PATCH net-next 02/14] tipc: move code for resetting links from bearer.c to link.c Jon Maloy
2014-02-12 18:31 ` [PATCH net-next 03/14] tipc: move code for deleting " Jon Maloy
2014-02-12 18:31 ` [PATCH net-next 04/14] tipc: redefine 'started' flag in struct link to bitmap Jon Maloy
2014-02-12 18:31 ` [PATCH net-next 05/14] tipc: remove 'links' list from tipc_bearer struct Jon Maloy
2014-02-13 0:00 ` David Miller
2014-02-12 18:31 ` [PATCH net-next 06/14] tipc: change reception of tunnelled duplicate packets Jon Maloy
2014-02-12 18:31 ` [PATCH net-next 07/14] tipc: change reception of tunnelled failover packets Jon Maloy
2014-02-12 18:31 ` [PATCH net-next 08/14] tipc: change signature of tunnelling reception function Jon Maloy
2014-02-12 18:31 ` [PATCH net-next 09/14] tipc: more cleanup " Jon Maloy
2014-02-12 18:31 ` Jon Maloy [this message]
2014-02-12 18:31 ` [PATCH net-next 11/14] tipc: changes to general packet reception algorithm Jon Maloy
2014-02-12 18:31 ` [PATCH net-next 12/14] tipc: delay delete of link when failover is needed Jon Maloy
2014-02-12 18:31 ` [PATCH net-next 13/14] tipc: remove bearer_lock from tipc_bearer struct Jon Maloy
2014-02-12 18:31 ` [PATCH net-next 14/14] tipc: add node_lock protection to link lookup function Jon Maloy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1392229874-29675-11-git-send-email-jon.maloy@ericsson.com \
--to=jon.maloy@ericsson.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=tipc-discussion@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).