Skip to content

Commit

Permalink
tipc: remove redundant call to tipc_node_remove_conn
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Erik Hugne authored and David S. Miller committed Mar 19, 2015
1 parent de1cf8a commit 18d6c58
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion net/tipc/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -2078,7 +2078,6 @@ static int tipc_shutdown(struct socket *sock, int how)
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);

Expand Down

0 comments on commit 18d6c58

Please sign in to comment.