aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/udp.c
diff options
context:
space:
mode:
authorVlad Yasevich <vyasevic@redhat.com>2012-11-15 03:49:22 -0500
committerDavid S. Miller <davem@davemloft.net>2012-11-15 17:39:24 -0500
commitc6b641a4c6b32f39db678c2441cb1ef824110d74 (patch)
tree251c4f988a2aca2b9b031afe192f3ae4705d3692 /net/ipv6/udp.c
parent808a8f884554f93315f663b2694addb4a177c578 (diff)
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.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 013fef740d51..dfaa29b8b293 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -50,7 +50,6 @@
50#include <linux/seq_file.h> 50#include <linux/seq_file.h>
51#include <trace/events/skb.h> 51#include <trace/events/skb.h>
52#include "udp_impl.h" 52#include "udp_impl.h"
53#include "ip6_offload.h"
54 53
55int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2) 54int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
56{ 55{
@@ -1472,13 +1471,9 @@ int __init udpv6_init(void)
1472{ 1471{
1473 int ret; 1472 int ret;
1474 1473
1475 ret = udp_offload_init();
1476 if (ret)
1477 goto out;
1478
1479 ret = inet6_add_protocol(&udpv6_protocol, IPPROTO_UDP); 1474 ret = inet6_add_protocol(&udpv6_protocol, IPPROTO_UDP);
1480 if (ret) 1475 if (ret)
1481 goto out_offload; 1476 goto out;
1482 1477
1483 ret = inet6_register_protosw(&udpv6_protosw); 1478 ret = inet6_register_protosw(&udpv6_protosw);
1484 if (ret) 1479 if (ret)
@@ -1488,8 +1483,6 @@ out:
1488 1483
1489out_udpv6_protocol: 1484out_udpv6_protocol:
1490 inet6_del_protocol(&udpv6_protocol, IPPROTO_UDP); 1485 inet6_del_protocol(&udpv6_protocol, IPPROTO_UDP);
1491out_offload:
1492 udp_offload_cleanup();
1493 goto out; 1486 goto out;
1494} 1487}
1495 1488
@@ -1497,5 +1490,4 @@ void udpv6_exit(void)
1497{ 1490{
1498 inet6_unregister_protosw(&udpv6_protosw); 1491 inet6_unregister_protosw(&udpv6_protosw);
1499 inet6_del_protocol(&udpv6_protocol, IPPROTO_UDP); 1492 inet6_del_protocol(&udpv6_protocol, IPPROTO_UDP);
1500 udp_offload_cleanup();
1501} 1493}