Merge tag 'v3.10.108' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / ipv6 / ip6_output.c

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 17a88ebcc8450b2a25aaa1201da0677a78f4ff19..3a65b9a9cb4d3691a680bd2055cfc513944102f0 100644 (file)
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1288,11 +1288,12 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to,
 
        skb = skb_peek_tail(&sk->sk_write_queue);
        cork->length += length;
-       if (((length > mtu) ||
-            (skb && skb_has_frags(skb))) &&
+       if ((skb && skb_has_frags(skb)) ||
+           (((length + fragheaderlen) > mtu) &&
+           (skb_queue_len(&sk->sk_write_queue) <= 1) &&
            (sk->sk_protocol == IPPROTO_UDP) &&
            (rt->dst.dev->features & NETIF_F_UFO) &&
-           (sk->sk_type == SOCK_DGRAM)) {
+           (sk->sk_type == SOCK_DGRAM))) {
                err = ip6_ufo_append_data(sk, getfrag, from, length,
                                          hh_len, fragheaderlen,
                                          transhdrlen, mtu, flags, rt);