summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
author[Dstephen hemminger <shemminger@vyatta.com>2011-03-31 11:58:35 -0700
committerAK <andi@firstfloor.org>2011-03-31 11:58:35 -0700
commit9afaa41ad6235dc13c19affd061dffb55cf9c6b2 (patch)
tree80a50fa45ca1e2005579d7970901f0880752bda1 /net
parent764504f33c9f5d2692dac5873c2bbbc7363b525c (diff)
ip6ip6-autoload-ip6-tunnel
Fromm foo From: stephen hemminger <shemminger@vyatta.com> Date: Thu, 10 Mar 2011 11:43:19 +0000 (+0000) Subject: ip6ip6: autoload ip6 tunnel From: stephen hemminger <shemminger@vyatta.com> commit 6dfbd87a20a737641ef228230c77f4262434fa24 upstream ip6ip6: autoload ip6 tunnel Add necessary alias to autoload ip6ip6 tunnel module. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'net')
-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 8f39893d8081..81b78878d5e6 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_NETDEV("ip6tnl0");
#define IPV6_TLV_TEL_DST_SIZE 8