aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorJon Paul Maloy <jon.maloy@ericsson.com>2014-02-13 17:29:14 -0500
committerDavid S. Miller <davem@davemloft.net>2014-02-13 17:57:06 -0500
commit02842f718d9d47950ec9045825679ec266ba532d (patch)
tree2ccca51c6f237bb827b7a4b2dba18aa2fe994a2e /net/tipc
parent1e9d47a948f44af4bb040e10a3a852b6bc3d6a90 (diff)
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 'net/tipc')
-rw-r--r--net/tipc/link.c22
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:
2177static int tipc_link_tunnel_rcv(struct tipc_node *n_ptr, 2177static int tipc_link_tunnel_rcv(struct tipc_node *n_ptr,
2178 struct sk_buff **buf) 2178 struct sk_buff **buf)
2179{ 2179{
2180 struct sk_buff *tunnel_buf = *buf; 2180 struct sk_buff *t_buf = *buf;
2181 struct tipc_link *dest_link; 2181 struct tipc_link *l_ptr;
2182 struct tipc_msg *tunnel_msg = buf_msg(tunnel_buf); 2182 struct tipc_msg *t_msg = buf_msg(t_buf);
2183 u32 bearer_id = msg_bearer_id(tunnel_msg); 2183 u32 bearer_id = msg_bearer_id(t_msg);
2184 2184
2185 *buf = NULL; 2185 *buf = NULL;
2186 2186
2187 if (bearer_id >= MAX_BEARERS) 2187 if (bearer_id >= MAX_BEARERS)
2188 goto exit; 2188 goto exit;
2189 2189
2190 dest_link = n_ptr->links[bearer_id]; 2190 l_ptr = n_ptr->links[bearer_id];
2191 if (!dest_link) 2191 if (!l_ptr)
2192 goto exit; 2192 goto exit;
2193 2193
2194 if (msg_type(tunnel_msg) == DUPLICATE_MSG) 2194 if (msg_type(t_msg) == DUPLICATE_MSG)
2195 tipc_link_dup_rcv(dest_link, tunnel_buf); 2195 tipc_link_dup_rcv(l_ptr, t_buf);
2196 else if (msg_type(tunnel_msg) == ORIGINAL_MSG) 2196 else if (msg_type(t_msg) == ORIGINAL_MSG)
2197 *buf = tipc_link_failover_rcv(dest_link, tunnel_buf); 2197 *buf = tipc_link_failover_rcv(l_ptr, t_buf);
2198 else 2198 else
2199 pr_warn("%sunknown tunnel pkt received\n", link_co_err); 2199 pr_warn("%sunknown tunnel pkt received\n", link_co_err);
2200 2200
2201exit: 2201exit:
2202 kfree_skb(tunnel_buf); 2202 kfree_skb(t_buf);
2203 return *buf != NULL; 2203 return *buf != NULL;
2204} 2204}
2205 2205