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/udp.c | |
| parent | 808a8f884554f93315f663b2694addb4a177c578 (diff) | |
| download | op-kernel-dev-c6b641a4c6b32f39db678c2441cb1ef824110d74.zip op-kernel-dev-c6b641a4c6b32f39db678c2441cb1ef824110d74.tar.gz | |
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/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 013fef7..dfaa29b 100644 --- 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(); } |
