Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

tcp: properly update lost_cnt_hint during shifting

lost_skb_hint is used by tcp_mark_head_lost() to mark the first unhandled skb.
lost_cnt_hint is the number of packets or sacked packets before the lost_skb_hint;
When shifting a skb that is before the lost_skb_hint, if tcp_is_fack() is ture,
the skb has already been counted in the lost_cnt_hint; if tcp_is_fack() is false,
tcp_sacktag_one() will increase the lost_cnt_hint. So tcp_shifted_skb() does not
need to adjust the lost_cnt_hint by itself. When shifting a skb that is equal to
lost_skb_hint, the shifted packets will not be counted by tcp_mark_head_lost().
So tcp_shifted_skb() should adjust the lost_cnt_hint even tcp_is_fack(tp) is true.

Signed-off-by: Zheng Yan <zheng.z.yan@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information...
commit 1e5289e121372a3494402b1b131b41bfe1cf9b7f 1 parent 260fcbe
Yan, Zheng authored October 02, 2011 davem330 committed October 04, 2011

Showing 1 changed file with 1 addition and 3 deletions. Show diff stats Hide diff stats

  1. 4  net/ipv4/tcp_input.c
4  net/ipv4/tcp_input.c
@@ -1389,9 +1389,7 @@ static int tcp_shifted_skb(struct sock *sk, struct sk_buff *skb,
1389 1389
 
1390 1390
 	BUG_ON(!pcount);
1391 1391
 
1392  
-	/* Tweak before seqno plays */
1393  
-	if (!tcp_is_fack(tp) && tcp_is_sack(tp) && tp->lost_skb_hint &&
1394  
-	    !before(TCP_SKB_CB(tp->lost_skb_hint)->seq, TCP_SKB_CB(skb)->seq))
  1392
+	if (skb == tp->lost_skb_hint)
1395 1393
 		tp->lost_cnt_hint += pcount;
1396 1394
 
1397 1395
 	TCP_SKB_CB(prev)->end_seq += shifted;

0 notes on commit 1e5289e

Please sign in to comment.
Something went wrong with that request. Please try again.