diff options
author | Alex Shi <alex.shi@linaro.org> | 2015-03-19 08:57:07 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2015-03-19 08:57:07 +0800 |
commit | 42f45c9abdea541a9f966553b5e71dd576d432f9 (patch) | |
tree | e9189f804b03d19696b0944a5a34ea9427177646 /net/ipv6/ip6_output.c | |
parent | 4d8fd56f051e5eea61209de4a3cb0619283a30af (diff) | |
parent | ba0bfedf4c9cad58f56a7038d1462ffc21cd33df (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-v3.10-15.03-android
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); |