ipv6: Switch to using new offload infrastructure.

Switch IPv6 protocol to using the new GRO/GSO calls and data.

Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 3 deletions

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 3ad44e176503..e4cc1f41012d 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1438,8 +1438,6 @@ out:
 static const struct inet6_protocol udpv6_protocol = {
         .handler        =       udpv6_rcv,
         .err_handler    =       udpv6_err,
-        .gso_send_check =       udp6_ufo_send_check,
-        .gso_segment    =       udp6_ufo_fragment,
         .flags          =       INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
 };
 
@@ -1570,10 +1568,14 @@ int __init udpv6_init(void)
 {
         int ret;
 
-        ret = inet6_add_protocol(&udpv6_protocol, IPPROTO_UDP);
+        ret = inet6_add_offload(&udpv6_offload, IPPROTO_UDP);
         if (ret)
                 goto out;
 
+        ret = inet6_add_protocol(&udpv6_protocol, IPPROTO_UDP);
+        if (ret)
+                goto out_offload;
+
         ret = inet6_register_protosw(&udpv6_protosw);
         if (ret)
                 goto out_udpv6_protocol;
@@ -1582,6 +1584,8 @@ out:
 
 out_udpv6_protocol:
         inet6_del_protocol(&udpv6_protocol, IPPROTO_UDP);
+out_offload:
+        inet6_del_offload(&udpv6_offload, IPPROTO_UDP);
         goto out;
 }
 
@@ -1589,4 +1593,5 @@ void udpv6_exit(void)
 {
         inet6_unregister_protosw(&udpv6_protosw);
         inet6_del_protocol(&udpv6_protocol, IPPROTO_UDP);
+        inet6_del_offload(&udpv6_offload, IPPROTO_UDP);
 }