From: Ying Xue <ying.xue@windriver.com>
Date: Thu, 29 Nov 2012 08:28:30 +0000 (+0800)
Subject: tipc: eliminate connection setup for implied connect in recv_msg()
X-Git-Tag: master-2012-12-14~5^2~48^2~2
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=cbab368790f23bc917d97fcf7a338c5ba5336ee0;p=~andy%2Flinux

tipc: eliminate connection setup for implied connect in recv_msg()

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 <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index dbce2745f0a..ef75b627024 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);