From cfda5c63828c6da45620d1200ded1b980aaddc4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Sat, 14 Mar 2009 14:23:07 +0000
Subject: [PATCH] --- yaml --- r: 135219 b: refs/heads/master c:
 afece1c6587010cc81d1a43045c855774e8234a3 h: refs/heads/master i:   135217:
 35c6ebc0cfba9bb7eabae1d751a9642530767552   135215:
 a5e3d0bf9b00082480d863594f6ce7dd6f237189 v: v3

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

diff --git a/[refs] b/[refs]
index 9ffcacd0a479..a9ade5e30290 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a3a041c4e2c1685e668b280c121a5a40a029a03
+refs/heads/master: afece1c6587010cc81d1a43045c855774e8234a3
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index 0db9f3b984f7..1c4d42ff72bd 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -689,7 +689,7 @@ static unsigned int tcp_xmit_size_goal(struct sock *sk, u32 mss_now,
 		}
 	}
 
-	return xmit_size_goal;
+	return max(xmit_size_goal, mss_now);
 }
 
 static int tcp_send_mss(struct sock *sk, int *size_goal, int flags)