This is a note to let you know that I've just added the patch titled
tcp: fix tcp_shifted_skb() adjustment of lost_cnt_hint for FACK
to the 3.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tcp-fix-tcp_shifted_skb-adjustment-of-lost_cnt_hint-for-fack.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 0d54dedba76b4142642d9f95b5548d75af5b3abb Mon Sep 17 00:00:00 2001
From: Neal Cardwell <[email protected]>
Date: Mon, 13 Feb 2012 20:22:08 +0000
Subject: tcp: fix tcp_shifted_skb() adjustment of lost_cnt_hint for FACK
From: Neal Cardwell <[email protected]>
[ Upstream commit 0af2a0d0576205dda778d25c6c344fc6508fc81d ]
This commit ensures that lost_cnt_hint is correctly updated in
tcp_shifted_skb() for FACK TCP senders. The lost_cnt_hint adjustment
in tcp_sacktag_one() only applies to non-FACK senders, so FACK senders
need their own adjustment.
This applies the spirit of 1e5289e121372a3494402b1b131b41bfe1cf9b7f -
except now that the sequence range passed into tcp_sacktag_one() is
correct we need only have a special case adjustment for FACK.
Signed-off-by: Neal Cardwell <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/ipv4/tcp_input.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1385,6 +1385,10 @@ static int tcp_shifted_skb(struct sock *
BUG_ON(!pcount);
+ /* Adjust hint for FACK. Non-FACK is handled in tcp_sacktag_one(). */
+ if (tcp_is_fack(tp) && (skb == tp->lost_skb_hint))
+ tp->lost_cnt_hint += pcount;
+
TCP_SKB_CB(prev)->end_seq += shifted;
TCP_SKB_CB(skb)->seq += shifted;
Patches currently in stable-queue which might be from [email protected] are
queue-3.0/tcp-fix-tcp_shifted_skb-adjustment-of-lost_cnt_hint-for-fack.patch
queue-3.0/tcp-allow-tcp_sacktag_one-to-tag-ranges-not-aligned-with-skbs.patch
queue-3.0/tcp-fix-range-tcp_shifted_skb-passes-to-tcp_sacktag_one.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
