Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 264282
b: refs/heads/master
c: 1e5289e
h: refs/heads/master
v: v3
  • Loading branch information
Yan, Zheng authored and David S. Miller committed Oct 5, 2011
1 parent 28b30e0 commit 5b5817c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 260fcbeb1ae9e768a44c9925338fbacb0d7e5ba9
refs/heads/master: 1e5289e121372a3494402b1b131b41bfe1cf9b7f
4 changes: 1 addition & 3 deletions trunk/net/ipv4/tcp_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 5b5817c

Please sign in to comment.