]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ip6_gre: Use correct flags for reading TUNNEL_SEQ
authorTom Herbert <tom@herbertland.com>
Tue, 10 May 2016 00:12:12 +0000 (17:12 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 May 2016 04:39:27 +0000 (00:39 -0400)
Fix two spots where o_flags in a tunnel are being compared to GRE_SEQ
instead of TUNNEL_SEQ.

Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_gre.c

index ec209f4d3312e78a4cf8ca55e3459b7b4901238a..ee62ec469ab3e6ad97d18656afe58cf440148071 100644 (file)
@@ -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.
                 */