diff options
author | Tom Herbert <tom@herbertland.com> | 2016-05-09 20:12:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-05-10 00:39:27 -0400 |
commit | b45bd1d787969d3ae5662a56ed431cd13e3b8b92 (patch) | |
tree | 28d1291b1b37cb866c6afebce23260670f617557 /net | |
parent | 4b4a0c91438c2471d7ab9504c0096ffc47d2389b (diff) |
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')
-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, | |||
343 | goto failed_free; | 343 | goto failed_free; |
344 | 344 | ||
345 | /* Can use a lockless transmit, unless we generate output sequences */ | 345 | /* Can use a lockless transmit, unless we generate output sequences */ |
346 | if (!(nt->parms.o_flags & GRE_SEQ)) | 346 | if (!(nt->parms.o_flags & TUNNEL_SEQ)) |
347 | dev->features |= NETIF_F_LLTX; | 347 | dev->features |= NETIF_F_LLTX; |
348 | 348 | ||
349 | dev_hold(dev); | 349 | dev_hold(dev); |
@@ -1314,7 +1314,7 @@ static int ip6gre_newlink(struct net *src_net, struct net_device *dev, | |||
1314 | dev->features |= GRE6_FEATURES; | 1314 | dev->features |= GRE6_FEATURES; |
1315 | dev->hw_features |= GRE6_FEATURES; | 1315 | dev->hw_features |= GRE6_FEATURES; |
1316 | 1316 | ||
1317 | if (!(nt->parms.o_flags & GRE_SEQ)) { | 1317 | if (!(nt->parms.o_flags & TUNNEL_SEQ)) { |
1318 | /* TCP segmentation offload is not supported when we | 1318 | /* TCP segmentation offload is not supported when we |
1319 | * generate output sequences. | 1319 | * generate output sequences. |
1320 | */ | 1320 | */ |