aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_tunnel.c
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-05-15 23:21:30 +0200
committerBen Hutchings <ben@decadent.org.uk>2014-07-11 13:33:57 +0100
commit30080eb2ea49bff4101b0a3587ae26a590b32c54 (patch)
treee6a668a4f90335d5a48e623e38063d9779f3dc49 /net/ipv6/ip6_tunnel.c
parent7343f010459a76c02ab4868a7301ae998f451a37 (diff)
downloadkernel_samsung_smdk4412-30080eb2ea49bff4101b0a3587ae26a590b32c54.zip
kernel_samsung_smdk4412-30080eb2ea49bff4101b0a3587ae26a590b32c54.tar.gz
kernel_samsung_smdk4412-30080eb2ea49bff4101b0a3587ae26a590b32c54.tar.bz2
net: tunnels - enable module autoloading
[ Upstream commit f98f89a0104454f35a62d681683c844f6dbf4043 ] Enable the module alias hookup to allow tunnel modules to be autoloaded on demand. This is in line with how most other netdev kinds work, and will allow userspace to create tunnels without having CAP_SYS_MODULE. Signed-off-by: Tom Gundersen <teg@jklm.no> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
-rw-r--r--net/ipv6/ip6_tunnel.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index d19f499..ae32ff7 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -57,6 +57,7 @@
MODULE_AUTHOR("Ville Nuorvala");
MODULE_DESCRIPTION("IPv6 tunneling device");
MODULE_LICENSE("GPL");
+MODULE_ALIAS_RTNL_LINK("ip6tnl");
MODULE_ALIAS_NETDEV("ip6tnl0");
#ifdef IP6_TNL_DEBUG