diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-07 13:38:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-07 13:38:43 -0400 |
| commit | 88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9 (patch) | |
| tree | 08c4399e0341f7eb0ccb24e15f2cab687275c2a4 /net/ipv4/tcp_input.c | |
| parent | 8083f0fc969d9b5353061a7a6f963405057e26b1 (diff) | |
| parent | 3ee72ca99288f1de95ec9c570e43f531c8799f06 (diff) | |
Merge branch 'master' of github.com:davem330/net
Conflicts:
net/batman-adv/soft-interface.c
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -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 143221ebeb7a..81cae641c9a9 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -1398,9 +1398,7 @@ static int tcp_shifted_skb(struct sock *sk, struct sk_buff *skb, | |||
| 1398 | 1398 | ||
| 1399 | BUG_ON(!pcount); | 1399 | BUG_ON(!pcount); |
| 1400 | 1400 | ||
| 1401 | /* Tweak before seqno plays */ | 1401 | if (skb == tp->lost_skb_hint) |
| 1402 | if (!tcp_is_fack(tp) && tcp_is_sack(tp) && tp->lost_skb_hint && | ||
| 1403 | !before(TCP_SKB_CB(tp->lost_skb_hint)->seq, TCP_SKB_CB(skb)->seq)) | ||
| 1404 | tp->lost_cnt_hint += pcount; | 1402 | tp->lost_cnt_hint += pcount; |
| 1405 | 1403 | ||
| 1406 | TCP_SKB_CB(prev)->end_seq += shifted; | 1404 | TCP_SKB_CB(prev)->end_seq += shifted; |