[PATCH] tcp: fix mid-wq adjustment helper

[PATCH] tcp: fix mid-wq adjustment helper

[Ilpo Järvinen]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 968 bytes --]


Just noticed while doing some new work that the recent
mid-wq adjustment logic will misbehave when FACK is not
in use (happens either due sysctl'ed off or auto-detected
reordering) because I forgot the relevant TCPCB tagbit.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>

---
 net/ipv4/tcp_output.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 2ce3cdd..5e4977c 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -761,7 +761,7 @@ static void tcp_adjust_pcount(struct sock *sk, struct sk_buff *skb, int decr)
 
 	if (tp->lost_skb_hint &&
 	    before(TCP_SKB_CB(skb)->seq, TCP_SKB_CB(tp->lost_skb_hint)->seq) &&
-	    (tcp_is_fack(tp) || TCP_SKB_CB(skb)->sacked))
+	    (tcp_is_fack(tp) || (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED)))
 		tp->lost_cnt_hint -= decr;
 
 	tcp_verify_left_out(tp);
-- 
tg: (adf84a1..) fix/adjust (depends on: rbtree/killfackets)

Re: [PATCH] tcp: fix mid-wq adjustment helper

[David Miller]

From: "Ilpo Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 18 Apr 2009 18:48:48 +0300 (EEST)

> 
> Just noticed while doing some new work that the recent
> mid-wq adjustment logic will misbehave when FACK is not
> in use (happens either due sysctl'ed off or auto-detected
> reordering) because I forgot the relevant TCPCB tagbit.
> 
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>

Applied, thank you!