From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ying Xue <ying.xue@windriver.com>
Subject: Re: [PATCH net-next 1/3] tipc: remove redundant call to tipc_node_remove_conn
Date: Wed, 18 Mar 2015 17:41:36 +0800
Message-ID: <55094850.8010107@windriver.com>
References: <1426670263-30358-1-git-send-email-erik.hugne@ericsson.com> <1426670263-30358-2-git-send-email-erik.hugne@ericsson.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Cc: <tipc-discussion@lists.sourceforge.net>
To: <erik.hugne@ericsson.com>, <richard.alpe@ericsson.com>,
	<jon.maloy@ericsson.com>, <netdev@vger.kernel.org>
Return-path: <netdev-owner@vger.kernel.org>
Received: from mail1.windriver.com ([147.11.146.13]:45906 "EHLO
	mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753810AbbCRJmE (ORCPT
	<rfc822;netdev@vger.kernel.org>); Wed, 18 Mar 2015 05:42:04 -0400
In-Reply-To: <1426670263-30358-2-git-send-email-erik.hugne@ericsson.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

On 03/18/2015 05:17 PM, erik.hugne@ericsson.com wrote:
> From: Erik Hugne <erik.hugne@ericsson.com>
> 
> 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>

> ---
>  net/tipc/socket.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/net/tipc/socket.c b/net/tipc/socket.c
> index 813847d..b6295c0 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);
>  
>