From 164ad08b1d5d8f9489f64688f4f0a803635488e8 Mon Sep 17 00:00:00 2001 From: Steffen Klassert Date: Wed, 22 Jun 2011 01:04:37 +0000 Subject: [PATCH] --- yaml --- r: 254240 b: refs/heads/master c: 33f99dc7fd948bbc808a24a0989c167f8973b643 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_output.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5fbc9b081d59..3ca74e7379a6 100644 --- 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 index a8024eaa0e87..6b894d430e61 100644 --- 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,