diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-19 08:57:04 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-19 08:57:04 +0800 |
| commit | ba0bfedf4c9cad58f56a7038d1462ffc21cd33df (patch) | |
| tree | bc5582403ad15b835d1b69b2ab81bda44292f3e3 /net/ipv6/ip6_output.c | |
| parent | 43e7406efd7822d75c64310461d2cbca0ece19f0 (diff) | |
| parent | 7f4e64246049cef5ae1eca37eec1701a9477799e (diff) | |
Merge tag 'v3.10.72' into linux-linaro-lsklsk-v3.10-15.03
This is the 3.10.72 stable release
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 071edcba4158..1ce7ea1f40b7 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1286,7 +1286,8 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, if (((length > mtu) || (skb && skb_has_frags(skb))) && (sk->sk_protocol == IPPROTO_UDP) && - (rt->dst.dev->features & NETIF_F_UFO)) { + (rt->dst.dev->features & NETIF_F_UFO) && + (sk->sk_type == SOCK_DGRAM)) { err = ip6_ufo_append_data(sk, getfrag, from, length, hh_len, fragheaderlen, transhdrlen, mtu, flags, rt); |