---

yaml --- r: 135219 b: refs/heads/master c: afece1c h: refs/heads/master i: 135217: 35c6ebc 135215: a5e3d0b v: v3
git-mirror · Mar 16, 2009 · cfda5c6 · cfda5c6
1 parent c1c20a8
commit cfda5c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
-    	return xmit_size_goal;
+    	return max(xmit_size_goal, mss_now);
     }
     static int tcp_send_mss(struct sock *sk, int *size_goal, int flags)
@@ Expand Down @@