diff options
| author |   Vlad Yasevich <vyasevic@redhat.com> | 2012-11-15 08:49:22 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-11-15 17:39:24 -0500 |
| commit | c6b641a4c6b32f39db678c2441cb1ef824110d74 (patch) | |
| tree | 251c4f988a2aca2b9b031afe192f3ae4705d3692 /net/ipv6/exthdrs.c | |
| parent | ipv4: Pull GSO registration out of inet_init() (diff) | |
| download | linux-dev-c6b641a4c6b32f39db678c2441cb1ef824110d74.tar.xz linux-dev-c6b641a4c6b32f39db678c2441cb1ef824110d74.zip | |
ipv6: Pull IPv6 GSO registration out of the module
Sing GSO support is now separate, pull it out of the module
and make it its own init call.
Remove the cleanup functions as they are no longer called.
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.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c index a786a20ad823..473f628f9f20 100644 --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c @@ -48,7 +48,6 @@ #endif #include <asm/uaccess.h> -#include "ip6_offload.h" /* * Parsing tlv encoded headers. @@ -502,13 +501,9 @@ int __init ipv6_exthdrs_init(void) { int ret; - ret = ipv6_exthdrs_offload_init(); - if (ret) - goto out; - ret = inet6_add_protocol(&rthdr_protocol, IPPROTO_ROUTING); if (ret) - goto out_offload; + goto out; ret = inet6_add_protocol(&destopt_protocol, IPPROTO_DSTOPTS); if (ret) @@ -524,14 +519,11 @@ out_destopt: inet6_del_protocol(&destopt_protocol, IPPROTO_DSTOPTS); out_rthdr: inet6_del_protocol(&rthdr_protocol, IPPROTO_ROUTING); -out_offload: - ipv6_exthdrs_offload_exit(); goto out; }; 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); |