sugar/linux
1
0
Fork 0
Code Activity

Merge branch 'master' into for-next

Browse Source 
Merge with 49717cb ("kthread: Document ways of reducing OS jitter due
to per-CPU kthreads") to be able to apply fixup patch on top of it.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Jiri Kosina
2013-05-28 10:09:22 +02:00
parent 071361d347 49717cb404
commit 864bfb25b5
328 changed files with 4894 additions and 1878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/tcp.h
View File

@@ -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) {