Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-09-23 10:16:53 -07:00
parent 3fb5ec0657 cd4175b116
commit 1f8d31d189
322 changed files with 5654 additions and 1907 deletions
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -2261,6 +2261,9 @@ static int __init ip6_tunnel_init(void)
 {
 	int  err;

+	if (!ipv6_mod_enabled())
+		return -EOPNOTSUPP;
+
 	err = register_pernet_device(&ip6_tnl_net_ops);
 	if (err < 0)
 		goto out_pernet;