diff options
author | Erik Hugne <erik.hugne@ericsson.com> | 2015-03-19 04:02:17 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-19 12:25:54 -0400 |
commit | 18d6c58415fa9f5ec98767a2434acc8197c7f288 (patch) | |
tree | 03651d0ea3ef90b8c6fa7f36c98c7d478103f54e | |
parent | de1cf8a7d7a369bc7d63f7be27e3d84ad6a69bb2 (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>
-rw-r--r-- | net/tipc/socket.c | 1 |
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: | |||
2078 | TIPC_CONN_SHUTDOWN)) | 2078 | TIPC_CONN_SHUTDOWN)) |
2079 | tipc_link_xmit_skb(net, skb, dnode, | 2079 | tipc_link_xmit_skb(net, skb, dnode, |
2080 | tsk->portid); | 2080 | tsk->portid); |
2081 | tipc_node_remove_conn(net, dnode, tsk->portid); | ||
2082 | } else { | 2081 | } else { |
2083 | dnode = tsk_peer_node(tsk); | 2082 | dnode = tsk_peer_node(tsk); |
2084 | 2083 | ||