From: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date: Tue, 21 Oct 2008 23:28:36 +0000 (-0700)
Subject: tcp: should use number of sack blocks instead of -1
X-Git-Tag: v2.6.28-rc1~3^2~26
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=75e3d8db531b462b875c1adb13eeb6b0be7374c0;p=linux-2.6-omap-h63xx.git

tcp: should use number of sack blocks instead of -1

While looking for the recent "sack issue" I also read all eff_sacks
usage that was played around by some relevant commit. I found
out that there's another thing that is asking for a fix (unrelated
to the "sack issue" though).

This feature has probably very little significance in practice.
Opposite direction timeout with bidirectional tcp comes to me as
the most likely scenario though there might be other cases as
well related to non-data segments we send (e.g., response to the
opposite direction segment). Also some ACK losses or option space
wasted for other purposes is necessary to prevent the earlier
SACK feedback getting to the sender.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 990a5849323..de54f02f10a 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -432,7 +432,7 @@ static void tcp_options_write(__be32 *ptr, struct tcp_sock *tp,
 
 		if (tp->rx_opt.dsack) {
 			tp->rx_opt.dsack = 0;
-			tp->rx_opt.eff_sacks--;
+			tp->rx_opt.eff_sacks = tp->rx_opt.num_sacks;
 		}
 	}
 }