From 2207afc8bfd80d596b524d4feb6b27f5ce359d59 Mon Sep 17 00:00:00 2001 From: Vlad Yasevich Date: Thu, 15 Nov 2012 08:49:19 +0000 Subject: 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 Signed-off-by: David S. Miller --- net/ipv6/exthdrs.c | 40 ++++------------------------------------ 1 file changed, 4 insertions(+), 36 deletions(-) (limited to 'net/ipv6/exthdrs.c') 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 +#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); -- cgit