From: Alexander Duyck <aduyck@mirantis.com>
To: jesse@kernel.org, netdev@vger.kernel.org, davem@davemloft.net,
alexander.duyck@gmail.com, tom@herbertland.com
Subject: [net-next PATCH 4/5] GRE: Add support for GRO/GSO of IPv6 GRE traffic
Date: Thu, 14 Apr 2016 15:33:58 -0400 [thread overview]
Message-ID: <20160414193358.12934.80013.stgit@ahduyck-xeon-server> (raw)
In-Reply-To: <20160414192709.12934.82858.stgit@ahduyck-xeon-server>
Since GRE doesn't really care about L3 protocol we can support IPv4 and
IPv6 using the same offloads. With that being the case we can add a call
to register the offloads for IPv6 as a part of our GRE offload
initialization.
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
---
net/ipv4/gre_offload.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c
index 20557f211408..e88190a8699a 100644
--- a/net/ipv4/gre_offload.c
+++ b/net/ipv4/gre_offload.c
@@ -292,6 +292,18 @@ static const struct net_offload gre_offload = {
static int __init gre_offload_init(void)
{
- return inet_add_offload(&gre_offload, IPPROTO_GRE);
+ int err;
+
+ err = inet_add_offload(&gre_offload, IPPROTO_GRE);
+#if IS_ENABLED(CONFIG_IPV6)
+ if (err)
+ return err;
+
+ err = inet6_add_offload(&gre_offload, IPPROTO_GRE);
+ if (err)
+ inet_del_offload(&gre_offload, IPPROTO_GRE);
+#endif
+
+ return err;
}
device_initcall(gre_offload_init);
next prev parent reply other threads:[~2016-04-14 19:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-14 19:33 [net-next PATCH 0/5] Add support for offloads with IPv6 GRE tunnels Alexander Duyck
2016-04-14 19:33 ` [net-next PATCH 1/5] ip_tunnel_core: iptunnel_handle_offloads returns int and doesn't free skb Alexander Duyck
2016-04-14 19:33 ` [net-next PATCH 2/5] ip6gretap: Fix MTU to allow for Ethernet header Alexander Duyck
2016-04-14 19:33 ` [net-next PATCH 3/5] ip6gre: Add support for basic offloads offloads excluding GSO Alexander Duyck
2016-04-14 19:33 ` Alexander Duyck [this message]
2016-04-14 19:34 ` [net-next PATCH 5/5] ip6gre: Add support for GSO Alexander Duyck
2016-04-16 23:12 ` [net-next PATCH 0/5] Add support for offloads with IPv6 GRE tunnels 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=20160414193358.12934.80013.stgit@ahduyck-xeon-server \
--to=aduyck@mirantis.com \
--cc=alexander.duyck@gmail.com \
--cc=davem@davemloft.net \
--cc=jesse@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tom@herbertland.com \
/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).