Commit 1e9d47a9 authored by Jon Paul Maloy's avatar Jon Paul Maloy Committed by David S. Miller

tipc: more cleanup of tunnelling reception function

We simplify and slim down the code in function tipc_tunnel_rcv()
No impact on the users of this function.
Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3bb53380
...@@ -2180,9 +2180,10 @@ static int tipc_link_tunnel_rcv(struct tipc_node *n_ptr, ...@@ -2180,9 +2180,10 @@ static int tipc_link_tunnel_rcv(struct tipc_node *n_ptr,
struct sk_buff *tunnel_buf = *buf; struct sk_buff *tunnel_buf = *buf;
struct tipc_link *dest_link; struct tipc_link *dest_link;
struct tipc_msg *tunnel_msg = buf_msg(tunnel_buf); struct tipc_msg *tunnel_msg = buf_msg(tunnel_buf);
u32 msg_typ = msg_type(tunnel_msg);
u32 bearer_id = msg_bearer_id(tunnel_msg); u32 bearer_id = msg_bearer_id(tunnel_msg);
*buf = NULL;
if (bearer_id >= MAX_BEARERS) if (bearer_id >= MAX_BEARERS)
goto exit; goto exit;
...@@ -2190,24 +2191,16 @@ static int tipc_link_tunnel_rcv(struct tipc_node *n_ptr, ...@@ -2190,24 +2191,16 @@ static int tipc_link_tunnel_rcv(struct tipc_node *n_ptr,
if (!dest_link) if (!dest_link)
goto exit; goto exit;
if (msg_typ == DUPLICATE_MSG) { if (msg_type(tunnel_msg) == DUPLICATE_MSG)
tipc_link_dup_rcv(dest_link, tunnel_buf); tipc_link_dup_rcv(dest_link, tunnel_buf);
goto exit; else if (msg_type(tunnel_msg) == ORIGINAL_MSG)
}
if (msg_type(tunnel_msg) == ORIGINAL_MSG) {
*buf = tipc_link_failover_rcv(dest_link, tunnel_buf); *buf = tipc_link_failover_rcv(dest_link, tunnel_buf);
else
pr_warn("%sunknown tunnel pkt received\n", link_co_err);
/* Do we have a buffer/buffer chain to return? */
if (*buf != NULL) {
kfree_skb(tunnel_buf);
return 1;
}
}
exit: exit:
*buf = NULL;
kfree_skb(tunnel_buf); kfree_skb(tunnel_buf);
return 0; return *buf != NULL;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment