diff --git a/[refs] b/[refs]
index 230ac3c52439..efb64710f9de 100644
--- 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
index ca6f52f392a9..91aa2dc51771 100644
--- 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);
 	}