---

yaml --- r: 254240 b: refs/heads/master c: 33f99dc h: refs/heads/master v: v3
git-mirror · Jun 28, 2011 · 164ad08 · 164ad08
1 parent 2175f30
commit 164ad08
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6fe5f4eccc2a7d2ad885ecb26a192b08dcc7cd1
+refs/heads/master: 33f99dc7fd948bbc808a24a0989c167f8973b643
diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c
@@ -888,12 +888,9 @@ static int __ip_append_data(struct sock *sk,
 			 * because we have no idea what fragment will be
 			 * the last.
 			 */
-			if (datalen == length + fraggap) {
+			if (datalen == length + fraggap)
 				alloclen += rt->dst.trailer_len;
-				/* make sure mtu is not reached */
-				if (datalen > mtu - fragheaderlen - rt->dst.trailer_len)
-					datalen -= ALIGN(rt->dst.trailer_len, 8);
-			}
+
 			if (transhdrlen) {
 				skb = sock_alloc_send_skb(sk,
 						alloclen + hh_len + 15,