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

Commit 4688f042 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

revert "ipv4: Should use consistent conditional judgement for ip fragment in... 


revert "ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output"

This reverts commit f102bb71 which is
commit 0a28cfd51e17f4f0a056bcf66bfbe492c3b99f38 upstream as there is
another patch that needs to be applied instead of this one.

Cc: Zheng Li <james.z.li@ericsson.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 53eed8aa

net/ipv4/ip_output.c

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



	cork->length += length;

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

	if (((length > 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) {