Merge tag 'stable/for-linus-3.8-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / ipv6 / exthdrs.c

diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index a786a20ad823985299591736ad79f8dbd6d9a78f..473f628f9f203d2e0c58466f32603ce50a330402 100644 (file)
--- 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);