From 7b4c376a53ad9d4b3b820af19ae4e58cce35ea75 Mon Sep 17 00:00:00 2001
From: Ying Xue <ying.xue@windriver.com>
Date: Thu, 29 Nov 2012 16:28:30 +0800
Subject: [PATCH] --- yaml --- r: 342043 b: refs/heads/master c:
 cbab368790f23bc917d97fcf7a338c5ba5336ee0 h: refs/heads/master i:   342041:
 25c217bf814b8d3e33106efa637133bd19f01d7e   342039:
 a1219e1152da210efd98296419b92bbc65f3866d v: v3

---
 [refs]                  | 2 +-
 trunk/net/tipc/socket.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c6ca647641ca..b632e1737377 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 584d24b3960e4c877fc623214815f278708f127c
+refs/heads/master: cbab368790f23bc917d97fcf7a338c5ba5336ee0
diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c
index dbce2745f0a8..ef75b6270247 100644
--- a/trunk/net/tipc/socket.c
+++ b/trunk/net/tipc/socket.c
@@ -946,13 +946,6 @@ static int recv_msg(struct kiocb *iocb, struct socket *sock,
 	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);