From c0a41ce939da801d2e2e7b1325fbd420a24e2218 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sat, 11 Mar 2006 18:51:49 -0800
Subject: [PATCH] --- yaml --- r: 21005 b: refs/heads/master c:
 ba244fe9005323452428fee4b4b7d0c70a06b627 h: refs/heads/master i:   21003:
 b2432f95d8a60c776f36d94395ccee06faadfe75 v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv4/tcp_output.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6a223a438aaa..f1bf48120629 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c12743764129e40dc8461afc1096cf175c7c25f2
+refs/heads/master: ba244fe9005323452428fee4b4b7d0c70a06b627
diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c
index a7623ead39a8..9f498a6c8895 100644
--- a/trunk/net/ipv4/tcp_output.c
+++ b/trunk/net/ipv4/tcp_output.c
@@ -1036,6 +1036,10 @@ static int tcp_tso_should_defer(struct sock *sk, struct tcp_sock *tp, struct sk_
 
 	limit = min(send_win, cong_win);
 
+	/* If a full-sized TSO skb can be sent, do it. */
+	if (limit >= 65536)
+		return 0;
+
 	if (sysctl_tcp_tso_win_divisor) {
 		u32 chunk = min(tp->snd_wnd, tp->snd_cwnd * tp->mss_cache);