Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux into next

[deliverable/linux.git] / net / ipv6 / af_inet6.c

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index c241c1805728f44c7e30c89e14aec413134f19e5..b0994a49dfca4c55a8385b2aec264f7119be8550 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -65,6 +65,8 @@
 #include <asm/uaccess.h>
 #include <linux/mroute6.h>
 
+#include "ip6_offload.h"
+
 MODULE_AUTHOR("Cast of dozens");
 MODULE_DESCRIPTION("IPv6 protocol stack for Linux");
 MODULE_LICENSE("GPL");
@@ -562,6 +564,7 @@ const struct proto_ops inet6_dgram_ops = {
        .recvmsg           = inet_recvmsg,              /* ok           */
        .mmap              = sock_no_mmap,
        .sendpage          = sock_no_sendpage,
+       .set_peek_off      = sk_set_peek_off,
 #ifdef CONFIG_COMPAT
        .compat_setsockopt = compat_sock_common_setsockopt,
        .compat_getsockopt = compat_sock_common_getsockopt,
@@ -959,6 +962,10 @@ static int __init inet6_init(void)
        if (err)
                goto udplitev6_fail;
 
+       err = udpv6_offload_init();
+       if (err)
+               goto udpv6_offload_fail;
+
        err = tcpv6_init();
        if (err)
                goto tcpv6_fail;
@@ -994,6 +1001,8 @@ pingv6_fail:
 ipv6_packet_fail:
        tcpv6_exit();
 tcpv6_fail:
+       udpv6_offload_exit();
+udpv6_offload_fail:
        udplitev6_exit();
 udplitev6_fail:
        udpv6_exit();