diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 10:09:22 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 10:09:29 +0200 |
| commit | 864bfb25b57a6766ea689befa5cf09a4353281ce (patch) | |
| tree | 478941ca6e76b8d77b71f5827a3ce751c46a72b5 /net/ipv4/tcp_input.c | |
| parent | 071361d3473ebb8142907470ff12d59c59f6be72 (diff) | |
| parent | 49717cb40410fe4b563968680ff7c513967504c6 (diff) | |
| download | op-kernel-dev-864bfb25b57a6766ea689befa5cf09a4353281ce.zip op-kernel-dev-864bfb25b57a6766ea689befa5cf09a4353281ce.tar.gz | |
Merge branch 'master' into for-next
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>
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index a759e19..0d9bdac 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5485,6 +5485,9 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb, if (tcp_checksum_complete_user(sk, skb)) goto csum_error; + if ((int)skb->truesize > sk->sk_forward_alloc) + goto step5; + /* Predicted packet is in window by definition. * seq == rcv_nxt and rcv_wup <= rcv_nxt. * Hence, check seq<=rcv_wup reduces to: @@ -5496,9 +5499,6 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb, tcp_rcv_rtt_measure_ts(sk, skb); - if ((int)skb->truesize > sk->sk_forward_alloc) - goto step5; - NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPHPHITS); /* Bulk data transfer: receiver */ |
