evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert "net: account for current skb length when deciding about UFO"

Browse source 
This reverts commit ef09c9ff343122a0b245416066992d096416ff19 which is
commit a5cb659bbc1c8644efa0c3138a757a1e432a4880 upstream as it causes
merge issues with later patches that are much more important...

Cc: Michal Kubecek <mkubecek@suse.cz>
Cc: Vlad Yasevich <vyasevic@redhat.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2017-08-11 09:14:09 -07:00
parent 63364a508d
commit 54fc0c3230
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/ipv4/ip_output.c
View file

@ -922,8 +922,7 @@ static int __ip_append_data(struct sock *sk,
csummode = CHECKSUM_PARTIAL; csummode = CHECKSUM_PARTIAL;
cork->length += length; cork->length += length;
if ((((length + (skb ? skb->len : fragheaderlen)) > mtu) || if ((((length + fragheaderlen) > mtu) || (skb && skb_is_gso(skb))) &&
(skb && skb_is_gso(skb))) &&
(sk->sk_protocol == IPPROTO_UDP) && (sk->sk_protocol == IPPROTO_UDP) &&
(rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len && (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len &&
(sk->sk_type == SOCK_DGRAM) && !sk->sk_no_check_tx) { (sk->sk_type == SOCK_DGRAM) && !sk->sk_no_check_tx) {

2
net/ipv6/ip6_output.c
View file

@ -1357,7 +1357,7 @@ emsgsize:
*/ */
cork->length += length; cork->length += length;
if ((((length + (skb ? skb->len : headersize)) > mtu) || if ((((length + fragheaderlen) > mtu) ||
(skb && skb_is_gso(skb))) && (skb && skb_is_gso(skb))) &&
(sk->sk_protocol == IPPROTO_UDP) && (sk->sk_protocol == IPPROTO_UDP) &&
(rt->dst.dev->features & NETIF_F_UFO) && (rt->dst.dev->features & NETIF_F_UFO) &&