From 019a76727ec40a3330f9cd51945dadc87a3dd925 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 20 Sep 2010 20:16:27 +0000 Subject: [PATCH] --- yaml --- r: 214757 b: refs/heads/master c: 59104f062435c7816e39ee5ed504a69cb8037f10 h: refs/heads/master i: 214755: aabdf5b1d28adb564f219992b006717dd5e51cae v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_output.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e4170cba4d27..d4aac81d2ed7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a02cec2155fbea457eca8881870fd2de1a4c4c76 +refs/heads/master: 59104f062435c7816e39ee5ed504a69cb8037f10 diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c index e42762023c27..3551b6dc7419 100644 --- a/trunk/net/ipv4/ip_output.c +++ b/trunk/net/ipv4/ip_output.c @@ -926,16 +926,19 @@ int ip_append_data(struct sock *sk, !(rt->dst.dev->features&NETIF_F_SG)) alloclen = mtu; else - alloclen = datalen + fragheaderlen; + alloclen = fraglen; /* The last fragment gets additional space at tail. * Note, with MSG_MORE we overallocate on fragments, * 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,