---

yaml --- r: 342043 b: refs/heads/master c: cbab368 h: refs/heads/master i: 342041: 25c217b 342039: a1219e1 v: v3
git-mirror · Dec 7, 2012 · 7b4c376 · 7b4c376
1 parent 0cb96dd
commit 7b4c376
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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);