diff options
author | Tom Gundersen <teg@jklm.no> | 2014-05-15 23:21:30 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-26 15:12:38 -0400 |
commit | 57b1ec6058e6633724817c9d001330a9fea9d39c (patch) | |
tree | 49d7ee5ef6d27c3c882763211e1f4e90d4dd40c3 /net/ipv4 | |
parent | 83880480db7b0a59c6304f9b86ae2b7024741045 (diff) |
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/ipv4')
-rw-r--r-- | net/ipv4/ipip.c | 1 |
1 files changed, 1 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"); |