diff options
| author |   Tom Herbert <tom@herbertland.com> | 2016-05-09 17:12:12 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-05-10 00:39:27 -0400 |
| commit | b45bd1d787969d3ae5662a56ed431cd13e3b8b92 (patch) | |
| tree | 28d1291b1b37cb866c6afebce23260670f617557 /net/ipv6/ip6_gre.c | |
| parent | ip6: Don't set transport header in IPv6 tunneling (diff) | |
| download | linux-dev-b45bd1d787969d3ae5662a56ed431cd13e3b8b92.tar.xz linux-dev-b45bd1d787969d3ae5662a56ed431cd13e3b8b92.zip | |
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: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_gre.c')
| -rw-r--r-- | net/ipv6/ip6_gre.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index ec209f4d3312..ee62ec469ab3 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -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. */ |