diff options
| author |   Jon Paul Maloy <jon.maloy@ericsson.com> | 2014-02-13 17:29:14 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-02-13 17:57:06 -0500 |
| commit | 02842f718d9d47950ec9045825679ec266ba532d (patch) | |
| tree | 2ccca51c6f237bb827b7a4b2dba18aa2fe994a2e /net/tipc/link.c | |
| parent | tipc: more cleanup of tunnelling reception function (diff) | |
| download | linux-dev-02842f718d9d47950ec9045825679ec266ba532d.tar.xz linux-dev-02842f718d9d47950ec9045825679ec266ba532d.zip | |
tipc: rename stack variables in function tipc_link_tunnel_rcv
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/tipc/link.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index 3136788799d8..b678c2e0080a 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -2177,29 +2177,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; } |