aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorErik Hugne <erik.hugne@ericsson.com>2015-03-19 09:02:17 +0100
committerDavid S. Miller <davem@davemloft.net>2015-03-19 12:25:54 -0400
commit18d6c58415fa9f5ec98767a2434acc8197c7f288 (patch)
tree03651d0ea3ef90b8c6fa7f36c98c7d478103f54e /net/tipc
parentde1cf8a7d7a369bc7d63f7be27e3d84ad6a69bb2 (diff)
tipc: remove redundant call to tipc_node_remove_conn
tipc_node_remove_conn may be called twice if shutdown() is called on a socket that have messages in the receive queue. Calling this function twice does no harm, but is unnecessary and we remove the redundant call. Signed-off-by: Erik Hugne <erik.hugne@ericsson.com> Acked-by: Ying Xue <ying.xue@windriver.com> Acked-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/socket.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index d7a6c10202e9..5bceebd81f64 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -2078,7 +2078,6 @@ restart:
TIPC_CONN_SHUTDOWN))
tipc_link_xmit_skb(net, skb, dnode,
tsk->portid);
- tipc_node_remove_conn(net, dnode, tsk->portid);
} else {
dnode = tsk_peer_node(tsk);

Privacy Policy