Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53eed8aa authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



This reverts commit ef09c9ff 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e5841355

net/ipv4/ip_output.c

+1 −2
Original line number Diff line number Diff line
@@ -936,8 +936,7 @@ static int __ip_append_data(struct sock *sk, 
		csummode = CHECKSUM_PARTIAL;



	cork->length += length;

	if ((((length + (skb ? skb->len : fragheaderlen)) > mtu) ||

	     (skb && skb_is_gso(skb))) &&

	if ((((length + fragheaderlen) > mtu) || (skb && skb_is_gso(skb))) &&

	    (sk->sk_protocol == IPPROTO_UDP) &&

	    (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len &&

	    (sk->sk_type == SOCK_DGRAM) && !sk->sk_no_check_tx) {

net/ipv6/ip6_output.c

+1 −1
Original line number Diff line number Diff line
@@ -1372,7 +1372,7 @@ static int __ip6_append_data(struct sock *sk, 
	 */



	cork->length += length;

	if ((((length + (skb ? skb->len : headersize)) > mtu) ||

	if ((((length + fragheaderlen) > mtu) ||

	     (skb && skb_is_gso(skb))) &&

	    (sk->sk_protocol == IPPROTO_UDP) &&

	    (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len &&