From: Erik Hugne <erik.hugne@ericsson.com>
Date: Thu, 19 Mar 2015 08:02:17 +0000 (+0100)
Subject: tipc: remove redundant call to tipc_node_remove_conn
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=18d6c58415fa9f5ec98767a2434acc8197c7f288;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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);