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

Commit b45bd1d7 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

ip6_gre: Use correct flags for reading TUNNEL_SEQ 



Fix two spots where o_flags in a tunnel are being compared to GRE_SEQ
instead of TUNNEL_SEQ.

Signed-off-by: default avatarTom Herbert <tom@herbertland.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4b4a0c91

net/ipv6/ip6_gre.c

+2 −2
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static struct ip6_tnl *ip6gre_tunnel_locate(struct net *net, 
		goto failed_free;



	/* Can use a lockless transmit, unless we generate output sequences */

	if (!(nt->parms.o_flags & GRE_SEQ))

	if (!(nt->parms.o_flags & TUNNEL_SEQ))

		dev->features |= NETIF_F_LLTX;



	dev_hold(dev);
@@ -1314,7 +1314,7 @@ static int ip6gre_newlink(struct net *src_net, struct net_device *dev, 
	dev->features		|= GRE6_FEATURES;

	dev->hw_features	|= GRE6_FEATURES;



	if (!(nt->parms.o_flags & GRE_SEQ)) {

	if (!(nt->parms.o_flags & TUNNEL_SEQ)) {

		/* TCP segmentation offload is not supported when we

		 * generate output sequences.

		 */