---

yaml --- r: 150117 b: refs/heads/master c: 7aedec2 h: refs/heads/master i: 150115: a35c412 v: v3
git-mirror · May 7, 2009 · eac8726 · eac8726
1 parent e72e3ab
commit eac8726
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: f5f8d86b231e0489c33542c42afbb14d32411ee8
+refs/heads/master: 7aedec2ad5314b173e78ca3f4edb4ceaa02248bb
diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h
@@ -908,7 +908,8 @@ 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(sk->sk_sleep);
+		wake_up_interruptible_poll(sk->sk_sleep,
+					   POLLIN | POLLRDNORM | POLLRDBAND);
 		if (!inet_csk_ack_scheduled(sk))
 			inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
 						  (3 * TCP_RTO_MIN) / 4,