From: Tom Herbert <tom@herbertland.com>
To: <davem@davemloft.net>, <netdev@vger.kernel.org>,
<alexander.duyck@gmail.com>
Cc: <kernel-team@fb.com>
Subject: [PATCH net-next 5/5] ip6_gre: Use correct flags for reading TUNNEL_SEQ
Date: Mon, 9 May 2016 17:12:12 -0700 [thread overview]
Message-ID: <1462839132-980991-6-git-send-email-tom@herbertland.com> (raw)
In-Reply-To: <1462839132-980991-1-git-send-email-tom@herbertland.com>
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>
---
net/ipv6/ip6_gre.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index ec209f4..ee62ec4 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.
*/
--
2.8.0.rc2
next prev parent reply other threads:[~2016-05-10 0:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-10 0:12 [PATCH net-next 0/5] ip6: Transmit tunneling fixes Tom Herbert
2016-05-10 0:12 ` [PATCH net-next 1/5] ip6_gre: Fix MTU setting Tom Herbert
2016-05-10 0:12 ` [PATCH net-next 2/5] gre6: Fix flag translations Tom Herbert
2016-05-10 0:12 ` [PATCH net-next 3/5] ip6_gre: Set inner protocol correctly in __gre6_xmit Tom Herbert
2016-05-10 0:12 ` [PATCH net-next 4/5] ip6: Don't set transport header in IPv6 tunneling Tom Herbert
2016-05-10 0:12 ` Tom Herbert [this message]
2016-05-10 3:30 ` [PATCH net-next 0/5] ip6: Transmit tunneling fixes Alexander Duyck
2016-05-10 4:39 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462839132-980991-6-git-send-email-tom@herbertland.com \
--to=tom@herbertland.com \
--cc=alexander.duyck@gmail.com \
--cc=davem@davemloft.net \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).