diff options
author | David S. Miller <davem@davemloft.net> | 2017-09-23 10:16:53 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-09-23 10:16:53 -0700 |
commit | 1f8d31d189cc6ce1e4b972959fda41e790bb92b8 (patch) | |
tree | fd3cca12a29319f073773ac55f7d41cc58e2c73f /net/ipv6/ip6_tunnel.c | |
parent | Merge branch 'ieee802154-for-davem-2017-09-20' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next (diff) | |
parent | Merge branch 'parisc-4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux (diff) | |
download | linux-dev-1f8d31d189cc6ce1e4b972959fda41e790bb92b8.tar.xz linux-dev-1f8d31d189cc6ce1e4b972959fda41e790bb92b8.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
-rw-r--r-- | net/ipv6/ip6_tunnel.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 3d6df489b39f..e0f9bc0421e0 100644 --- 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; |