diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-06 16:15:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-06 16:15:10 -0700 |
| commit | 3ee72ca99288f1de95ec9c570e43f531c8799f06 (patch) | |
| tree | 1199d129cb94b128eb6029d5fcc3ff0d4900b067 /net/ipv4/tcp_input.c | |
| parent | x86/PCI: use host bridge _CRS info on ASUS M2V-MX SE (diff) | |
| parent | net: fix typos in Documentation/networking/scaling.txt (diff) | |
| download | wireguard-linux-3ee72ca99288f1de95ec9c570e43f531c8799f06.tar.xz wireguard-linux-3ee72ca99288f1de95ec9c570e43f531c8799f06.zip | |
Merge git://github.com/davem330/net
* git://github.com/davem330/net:
net: fix typos in Documentation/networking/scaling.txt
bridge: leave carrier on for empty bridge
netfilter: Use proper rwlock init function
tcp: properly update lost_cnt_hint during shifting
tcp: properly handle md5sig_pool references
macvlan/macvtap: Fix unicast between macvtap interfaces in bridge mode
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/tcp_input.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 21fab3edb92c..d73aab3fbfc0 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1389,9 +1389,7 @@ static int tcp_shifted_skb(struct sock *sk, struct sk_buff *skb, BUG_ON(!pcount); - /* Tweak before seqno plays */ - if (!tcp_is_fack(tp) && tcp_is_sack(tp) && tp->lost_skb_hint && - !before(TCP_SKB_CB(tp->lost_skb_hint)->seq, TCP_SKB_CB(skb)->seq)) + if (skb == tp->lost_skb_hint) tp->lost_cnt_hint += pcount; TCP_SKB_CB(prev)->end_seq += shifted; |