---

yaml --- r: 360785 b: refs/heads/master c: 79ffef1 h: refs/heads/master i: 360783: 159e91f v: v3
git-mirror · Feb 28, 2013 · 1858569 · 1858569
1 parent 90a9778
commit 1858569
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d6d840683228ebded898a865657394981c82aaa
+refs/heads/master: 79ffef1fe213851f44bfccf037170a140e929f85
diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h
@@ -1045,6 +1045,10 @@ static inline bool tcp_prequeue(struct sock *sk, struct sk_buff *skb)
 	if (sysctl_tcp_low_latency || !tp->ucopy.task)
 		return false;
 
+	if (skb->len <= tcp_hdrlen(skb) &&
+	    skb_queue_len(&tp->ucopy.prequeue) == 0)
+		return false;
+
 	__skb_queue_tail(&tp->ucopy.prequeue, skb);
 	tp->ucopy.memory += skb->truesize;
 	if (tp->ucopy.memory > sk->sk_rcvbuf) {