---

yaml --- r: 187928 b: refs/heads/master c: c839d30 h: refs/heads/master v: v3
git-mirror · Mar 4, 2010 · 81efb86 · 81efb86
1 parent a9cfb25
commit 81efb86
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f37ada5b5f6bfb4d251a7f510f249cb855b77b3
+refs/heads/master: c839d30a41dd92eb32d7fcfa2b4e99042fc64bf2
diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h
@@ -939,7 +939,7 @@ static inline int tcp_prequeue(struct sock *sk, struct sk_buff *skb)
 
 		tp->ucopy.memory = 0;
 	} else if (skb_queue_len(&tp->ucopy.prequeue) == 1) {
-		wake_up_interruptible_poll(sk->sk_sleep,
+		wake_up_interruptible_sync_poll(sk->sk_sleep,
 					   POLLIN | POLLRDNORM | POLLRDBAND);
 		if (!inet_csk_ack_scheduled(sk))
 			inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,