From a6152d2afd79b4d10312d3082bcf4f466c47aca9 Mon Sep 17 00:00:00 2001
From: John Heffner <johnwheffner@gmail.com>
Date: Tue, 29 Apr 2008 03:13:02 -0700
Subject: [PATCH] --- yaml --- r: 95382 b: refs/heads/master c:
 ce447eb91409225f8a488f6b7b2a1bdf7b2d884f h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/net/ipv4/tcp_cong.c | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index bf1b74df19be..e9e730586780 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0313587547092af7f5ee8a576793e1e5d61be89
+refs/heads/master: ce447eb91409225f8a488f6b7b2a1bdf7b2d884f
diff --git a/trunk/net/ipv4/tcp_cong.c b/trunk/net/ipv4/tcp_cong.c
index 3a6be23d222f..bfb1996bd99f 100644
--- a/trunk/net/ipv4/tcp_cong.c
+++ b/trunk/net/ipv4/tcp_cong.c
@@ -285,14 +285,11 @@ int tcp_is_cwnd_limited(const struct sock *sk, u32 in_flight)
 	if (in_flight >= tp->snd_cwnd)
 		return 1;
 
-	if (!sk_can_gso(sk))
-		return 0;
-
 	left = tp->snd_cwnd - in_flight;
-	if (sysctl_tcp_tso_win_divisor)
-		return left * sysctl_tcp_tso_win_divisor < tp->snd_cwnd;
-	else
-		return left <= tcp_max_burst(tp);
+	if (sk_can_gso(sk) &&
+	    left * sysctl_tcp_tso_win_divisor < tp->snd_cwnd)
+		return 1;
+	return left <= tcp_max_burst(tp);
 }
 EXPORT_SYMBOL_GPL(tcp_is_cwnd_limited);