tipc: remove redundant call to tipc_node_remove_conn
authorErik Hugne <erik.hugne@ericsson.com>
Thu, 19 Mar 2015 08:02:17 +0000 (09:02 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 19 Mar 2015 16:25:54 +0000 (12:25 -0400)
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>
net/tipc/socket.c

index d7a6c10202e99780c8c83d94867893b7c6366167..5bceebd81f642b102ebb85c4a84631e24b6a976d 100644 (file)
@@ -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);