diff options
| author | Bruno Martins <bgcngm@gmail.com> | 2018-03-28 19:55:51 +0100 |
|---|---|---|
| committer | Bruno Martins <bgcngm@gmail.com> | 2018-03-28 19:58:22 +0100 |
| commit | 03e0b4f36fc60c226adacdb48306df9ec65de33b (patch) | |
| tree | 05d20001396a1c84eba56977e17800f90e0b384b /net/ipv4/ip_output.c | |
| parent | b74f9f2f862c0778747d70e0b2b1792fadd24e02 (diff) | |
| parent | 1a83af8aa99799d4fd163a9fb6469015c89fdc99 (diff) | |
Change-Id: Ice23a0b611d9bfa7a00cfa6e82a9712dcaf049e0
Diffstat (limited to 'net/ipv4/ip_output.c')
| -rw-r--r-- | net/ipv4/ip_output.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 47d236156f0..b3458e0cd84 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -843,10 +843,12 @@ static int __ip_append_data(struct sock *sk, csummode = CHECKSUM_PARTIAL; cork->length += length; - if (((length > mtu) || (skb && skb_has_frags(skb))) && + if ((skb && skb_has_frags(skb)) || + ((length > mtu) && + (skb_queue_len(queue) <= 1) && (sk->sk_protocol == IPPROTO_UDP) && (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len && - (sk->sk_type == SOCK_DGRAM)) { + (sk->sk_type == SOCK_DGRAM))) { err = ip_ufo_append_data(sk, queue, getfrag, from, length, hh_len, fragheaderlen, transhdrlen, maxfraglen, flags); @@ -1157,6 +1159,7 @@ ssize_t ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page, cork->length += size; if ((size + skb->len > mtu) && + (skb_queue_len(&sk->sk_write_queue) == 1) && (sk->sk_protocol == IPPROTO_UDP) && (rt->dst.dev->features & NETIF_F_UFO)) { skb_shinfo(skb)->gso_size = mtu - fragheaderlen; |