diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-10 14:26:00 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-10 14:26:00 -0800 |
| commit | 33175d84ee3fa29991adb80513683e010769e807 (patch) | |
| tree | 3731f61cf82451b6892cf1368701e57e35d92908 /net/ipv6 | |
| parent | c5908939b2738bafe1b309bc2465cb9f2e6184c5 (diff) | |
| parent | 6dfbd87a20a737641ef228230c77f4262434fa24 (diff) | |
| download | lwn-33175d84ee3fa29991adb80513683e010769e807.tar.gz lwn-33175d84ee3fa29991adb80513683e010769e807.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x_cmn.c
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 1 | ||||
| -rw-r--r-- | net/ipv6/route.c | 4 | ||||
| -rw-r--r-- | net/ipv6/sit.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 02730ef26b0f..ea8d5e8128a9 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"); #ifdef IP6_TNL_DEBUG #define IP6_TNL_TRACE(x...) printk(KERN_DEBUG "%s:" x "\n", __func__) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index d55d00c2a824..001276055a6b 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -783,8 +783,10 @@ restart: if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) nrt = rt6_alloc_cow(rt, &fl->fl6_dst, &fl->fl6_src); - else + else if (!(rt->dst.flags & DST_HOST)) nrt = rt6_alloc_clone(rt, &fl->fl6_dst); + else + goto out2; dst_release(&rt->dst); rt = nrt ? : net->ipv6.ip6_null_entry; diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index b8c8adbd7cf6..3534ceaa4fba 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1295,4 +1295,4 @@ static int __init sit_init(void) module_init(sit_init); module_exit(sit_cleanup); MODULE_LICENSE("GPL"); -MODULE_ALIAS("sit0"); +MODULE_ALIAS_NETDEV("sit0"); |