aboutsummaryrefslogtreecommitdiff
path: root/net/ipv6/ip6_output.c
diff options
context:
space:
mode:
authorBruno Martins <bgcngm@gmail.com>2018-03-28 19:55:51 +0100
committerBruno Martins <bgcngm@gmail.com>2018-03-28 19:58:22 +0100
commit03e0b4f36fc60c226adacdb48306df9ec65de33b (patch)
tree05d20001396a1c84eba56977e17800f90e0b384b /net/ipv6/ip6_output.c
parentb74f9f2f862c0778747d70e0b2b1792fadd24e02 (diff)
parent1a83af8aa99799d4fd163a9fb6469015c89fdc99 (diff)
Merge remote-tracking branch 'common/android-3.10' into HEADHEADo8.1
Change-Id: Ice23a0b611d9bfa7a00cfa6e82a9712dcaf049e0
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r--net/ipv6/ip6_output.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index f38a59b16f8..146bc086cef 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1285,11 +1285,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);