From: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date: Fri, 23 Nov 2007 11:10:56 +0000 (+0800)
Subject: [TCP] MTUprobe: Cleanup send queue check (no need to loop)
X-Git-Tag: v2.6.24-rc4~90^2~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f9c33e515353ea91afc62341161fead19e78567;p=linux-2.6

[TCP] MTUprobe: Cleanup send queue check (no need to loop)

The original code has striking complexity to perform a query
which can be reduced to a very simple compare.

FIN seqno may be included to write_seq but it should not make
any significant difference here compared to skb->len which was
used previously. One won't end up there with SYN still queued.

Use of write_seq check guarantees that there's a valid skb in
send_head so I removed the extra check.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Acked-by: John Heffner <jheffner@psc.edu>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 4f8a8a1789..e5130a7fe1 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1321,12 +1321,7 @@ static int tcp_mtu_probe(struct sock *sk)
 	}
 
 	/* Have enough data in the send queue to probe? */
-	len = 0;
-	if ((skb = tcp_send_head(sk)) == NULL)
-		return -1;
-	while ((len += skb->len) < size_needed && !tcp_skb_is_last(sk, skb))
-		skb = tcp_write_queue_next(sk, skb);
-	if (len < size_needed)
+	if (tp->write_seq - tp->snd_nxt < size_needed)
 		return -1;
 
 	if (tp->snd_wnd < size_needed)