---

yaml --- r: 90723 b: refs/heads/master c: 9900980 h: refs/heads/master i: 90721: b94f7a8 90719: 913cc5e v: v3
git-mirror · Apr 15, 2008 · 3a385f4 · 3a385f4
1 parent ba4077e
commit 3a385f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c8dd11636e3a5f14a7fb765331b7043f01fe937
+refs/heads/master: 990098068fe963f956c14f681bd88d90dcb14584
diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c
@@ -919,7 +919,8 @@ static int recv_msg(struct kiocb *iocb, struct socket *sock,
 	/* Consume received message (optional) */
 
 	if (likely(!(flags & MSG_PEEK))) {
-		if (unlikely(++tsock->p->conn_unacked >= TIPC_FLOW_CONTROL_WIN))
+		if ((sock->state != SS_READY) &&
+		    (++tsock->p->conn_unacked >= TIPC_FLOW_CONTROL_WIN))
 			tipc_acknowledge(tsock->p->ref, tsock->p->conn_unacked);
 		advance_queue(tsock);
 	}