From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Gortmaker Subject: [PATCH net-next 7/9] tipc: eliminate connection setup for implied connect in recv_msg() Date: Fri, 7 Dec 2012 20:19:16 -0500 Message-ID: <1354929558-16948-8-git-send-email-paul.gortmaker@windriver.com> References: <1354929558-16948-1-git-send-email-paul.gortmaker@windriver.com> Mime-Version: 1.0 Content-Type: text/plain Cc: , Jon Maloy , Ying Xue , Paul Gortmaker To: David Miller Return-path: Received: from mail1.windriver.com ([147.11.146.13]:46485 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757479Ab2LHBTh (ORCPT ); Fri, 7 Dec 2012 20:19:37 -0500 In-Reply-To: <1354929558-16948-1-git-send-email-paul.gortmaker@windriver.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Ying Xue As connection setup is now completed asynchronously in BH context, in the function filter_connect(), the corresponding code in recv_msg() becomes redundant. Signed-off-by: Ying Xue Signed-off-by: Jon Maloy Signed-off-by: Paul Gortmaker --- net/tipc/socket.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/net/tipc/socket.c b/net/tipc/socket.c index dbce274..ef75b62 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -946,13 +946,6 @@ restart: sz = msg_data_sz(msg); err = msg_errcode(msg); - /* Complete connection setup for an implied connect */ - if (unlikely(sock->state == SS_CONNECTING)) { - res = auto_connect(sock, msg); - if (res) - goto exit; - } - /* Discard an empty non-errored message & try again */ if ((!sz) && (!err)) { advance_rx_queue(sk); -- 1.7.12.1