ipv6: Pull IPv6 GSO registration out of the module

[~andy/linux] / net / ipv6 / udp.c

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 013fef740d510c1ee33f0bb0fae98e72f86d1d67..dfaa29b8b2939c03fef13fa416f6fdaef031bf5d 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -50,7 +50,6 @@
 #include <linux/seq_file.h>
 #include <trace/events/skb.h>
 #include "udp_impl.h"
-#include "ip6_offload.h"
 
 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
 {
@@ -1472,13 +1471,9 @@ int __init udpv6_init(void)
 {
        int ret;
 
-       ret = udp_offload_init();
-       if (ret)
-               goto out;
-
        ret = inet6_add_protocol(&udpv6_protocol, IPPROTO_UDP);
        if (ret)
-               goto out_offload;
+               goto out;
 
        ret = inet6_register_protosw(&udpv6_protosw);
        if (ret)
@@ -1488,8 +1483,6 @@ out:
 
 out_udpv6_protocol:
        inet6_del_protocol(&udpv6_protocol, IPPROTO_UDP);
-out_offload:
-       udp_offload_cleanup();
        goto out;
 }
 
@@ -1497,5 +1490,4 @@ void udpv6_exit(void)
 {
        inet6_unregister_protosw(&udpv6_protosw);
        inet6_del_protocol(&udpv6_protocol, IPPROTO_UDP);
-       udp_offload_cleanup();
 }