summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>2007-07-02 22:07:22 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-10 22:16:24 -0700
commitd0410051164bbbc597e15f068b53c06a954ae0d4 (patch)
tree9b3385d276eac1b33d7347934773c976cc2b4a81 /net
parent61cbc2fca6335be52788773b21efdc52a2750924 (diff)
downloadlinux-stable-d0410051164bbbc597e15f068b53c06a954ae0d4.tar.gz
linux-stable-d0410051164bbbc597e15f068b53c06a954ae0d4.tar.bz2
linux-stable-d0410051164bbbc597e15f068b53c06a954ae0d4.zip
[TCP]: SACK fastpath did override adjusted fackets_out
Do same adjustment to SACK fastpath counters provided that they're valid. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp_output.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 53232dd6fb48..20aea1595c4d 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -699,6 +699,14 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss
tp->fackets_out -= diff;
if ((int)tp->fackets_out < 0)
tp->fackets_out = 0;
+ /* SACK fastpath might overwrite it unless dealt with */
+ if (tp->fastpath_skb_hint != NULL &&
+ after(TCP_SKB_CB(tp->fastpath_skb_hint)->seq,
+ TCP_SKB_CB(skb)->seq)) {
+ tp->fastpath_cnt_hint -= diff;
+ if ((int)tp->fastpath_cnt_hint < 0)
+ tp->fastpath_cnt_hint = 0;
+ }
}
}