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

Commit 0eecb784 authored by Shan Wei's avatar Shan Wei Committed by David S. Miller
Browse files

ipv6: cancel to setting local_df in ip6_xmit() 



commit f88037(sctp: Drop ipfargok in sctp_xmit function)
has droped ipfragok and set local_df value properly.

So the change of commit 77e2f1(ipv6: Fix ip6_xmit to
send fragments if ipfragok is true) is not needed.
So the patch remove them.

Signed-off-by: default avatarShan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a4fbf841

net/ipv6/ip6_output.c

+0 −4
Original line number Diff line number Diff line
@@ -231,10 +231,6 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl, 
	skb_reset_network_header(skb);

	hdr = ipv6_hdr(skb);



	/* Allow local fragmentation. */

	if (ipfragok)

		skb->local_df = 1;



	/*

	 *	Fill in the IPv6 header

	 */