summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-05-15 23:21:30 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-26 15:12:38 -0400
commit57b1ec6058e6633724817c9d001330a9fea9d39c (patch)
tree49d7ee5ef6d27c3c882763211e1f4e90d4dd40c3 /net
parent83880480db7b0a59c6304f9b86ae2b7024741045 (diff)
downloadlinux-3.10-57b1ec6058e6633724817c9d001330a9fea9d39c.tar.gz
linux-3.10-57b1ec6058e6633724817c9d001330a9fea9d39c.tar.bz2
linux-3.10-57b1ec6058e6633724817c9d001330a9fea9d39c.zip
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/ipip.c1
-rw-r--r--net/ipv6/ip6_tunnel.c1
-rw-r--r--net/ipv6/sit.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index f5cc7b33151..562ed15318a 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -483,4 +483,5 @@ static void __exit ipip_fini(void)
module_init(ipip_init);
module_exit(ipip_fini);
MODULE_LICENSE("GPL");
+MODULE_ALIAS_RTNL_LINK("ipip");
MODULE_ALIAS_NETDEV("tunl0");
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 73d7f68da55..a0ecdf596f2 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -61,6 +61,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
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 620d326e8fd..b91179344e7 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1654,4 +1654,5 @@ xfrm_tunnel_failed:
module_init(sit_init);
module_exit(sit_cleanup);
MODULE_LICENSE("GPL");
+MODULE_ALIAS_RTNL_LINK("sit");
MODULE_ALIAS_NETDEV("sit0");