summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>2009-04-18 05:48:48 +0000
committerDavid S. Miller <davem@davemloft.net>2009-04-20 02:15:00 -0700
commit52cf3cc8acea52ecb93ef1dddb4ef2ae4e35c319 (patch)
treeb4ef4d7350d57d1512f12d3d529efa677ff94243 /net/ipv4
parent8caf153974f2274301e583fda732cc8e5b80331f (diff)
downloadop-kernel-dev-52cf3cc8acea52ecb93ef1dddb4ef2ae4e35c319.zip
op-kernel-dev-52cf3cc8acea52ecb93ef1dddb4ef2ae4e35c319.tar.gz
tcp: fix mid-wq adjustment helper
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/tcp_output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 53300fa..59aec60 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -778,7 +778,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);
OpenPOWER on IntegriCloud