summaryrefslogtreecommitdiffstats
path: root/net/ipv6/exthdrs.c
diff options
context:
space:
mode:
authorVlad Yasevich <vyasevic@redhat.com>2012-11-15 08:49:19 +0000
committerDavid S. Miller <davem@davemloft.net>2012-11-15 17:36:18 -0500
commit2207afc8bfd80d596b524d4feb6b27f5ce359d59 (patch)
treed49e698603a536b4b88ec6482eecd15e01ef2533 /net/ipv6/exthdrs.c
parent5edbb07dc9474b7d4cd4391a2e6551ad067a0f96 (diff)
downloadlinux-2207afc8bfd80d596b524d4feb6b27f5ce359d59.tar.bz2
ipv6: Move exthdr offload support into separate file
Move the exthdr offload functionality into a separeate file in preparate for moving it out of the module Signed-off-by: Vlad Yasevich <vyasevic@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/exthdrs.c')
-rw-r--r--net/ipv6/exthdrs.c40
1 files changed, 4 insertions, 36 deletions
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index de6559e3aa0a..70fbf6bc5a87 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -48,6 +48,7 @@
#endif
#include <asm/uaccess.h>
+#include "ip6_offload.h"
int ipv6_find_tlv(struct sk_buff *skb, int offset, int type)
{
@@ -528,20 +529,12 @@ unknown_rh:
static const struct inet6_protocol rthdr_protocol = {
.handler = ipv6_rthdr_rcv,
- .flags = INET6_PROTO_NOPOLICY | INET6_PROTO_GSO_EXTHDR,
-};
-
-static const struct net_offload rthdr_offload = {
- .flags = INET6_PROTO_GSO_EXTHDR,
+ .flags = INET6_PROTO_NOPOLICY,
};
static const struct inet6_protocol destopt_protocol = {
.handler = ipv6_destopt_rcv,
- .flags = INET6_PROTO_NOPOLICY | INET6_PROTO_GSO_EXTHDR,
-};
-
-static const struct net_offload dstopt_offload = {
- .flags = INET6_PROTO_GSO_EXTHDR,
+ .flags = INET6_PROTO_NOPOLICY,
};
static const struct inet6_protocol nodata_protocol = {
@@ -549,32 +542,6 @@ static const struct inet6_protocol nodata_protocol = {
.flags = INET6_PROTO_NOPOLICY,
};
-static int ipv6_exthdrs_offload_init(void)
-{
- int ret;
-
- ret = inet6_add_offload(&rthdr_offload, IPPROTO_ROUTING);
- if (!ret)
- goto out;
-
- ret = inet6_add_offload(&dstopt_offload, IPPROTO_DSTOPTS);
- if (!ret)
- goto out_rt;
-
-out:
- return ret;
-
-out_rt:
- inet_del_offload(&rthdr_offload, IPPROTO_ROUTING);
- goto out;
-}
-
-static void ipv6_exthdrs_offload_exit(void)
-{
- inet_del_offload(&rthdr_offload, IPPROTO_ROUTING);
- inet_del_offload(&rthdr_offload, IPPROTO_DSTOPTS);
-}
-
int __init ipv6_exthdrs_init(void)
{
int ret;
@@ -608,6 +575,7 @@ out_offload:
void ipv6_exthdrs_exit(void)
{
+ ipv6_exthdrs_offload_exit();
inet6_del_protocol(&nodata_protocol, IPPROTO_NONE);
inet6_del_protocol(&destopt_protocol, IPPROTO_DSTOPTS);
inet6_del_protocol(&rthdr_protocol, IPPROTO_ROUTING);