diff options
author | Gao feng <gaofeng@cn.fujitsu.com> | 2013-06-15 23:14:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-06-20 02:04:50 -0400 |
commit | a881ae1f625c599b460cc8f8a7fcb1c438f699ad (patch) | |
tree | a005138027964c7e1a3c4402c84bbb8b07247123 /net/ipv6/addrconf.c | |
parent | 9fa8e980bb0a56e46ddd97731f83f608c39aa7a5 (diff) |
ipv6: don't call addrconf_dst_alloc again when enable lo
If we disable all of the net interfaces, and enable
un-lo interface before lo interface, we already allocated
the addrconf dst in ipv6_add_addr. So we shouldn't allocate
it again when we enable lo interface.
Otherwise the message below will be triggered.
unregister_netdevice: waiting for sit1 to become free. Usage count = 1
This problem is introduced by commit 25fb6ca4ed9cad72f14f61629b68dc03c0d9713f
"net IPv6 : Fix broken IPv6 routing table after loopback down-up"
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r-- | net/ipv6/addrconf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 1bbf744c2cc3..77b626136c23 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -2655,6 +2655,9 @@ static void init_loopback(struct net_device *dev) | |||
2655 | if (sp_ifa->flags & (IFA_F_DADFAILED | IFA_F_TENTATIVE)) | 2655 | if (sp_ifa->flags & (IFA_F_DADFAILED | IFA_F_TENTATIVE)) |
2656 | continue; | 2656 | continue; |
2657 | 2657 | ||
2658 | if (sp_ifa->rt) | ||
2659 | continue; | ||
2660 | |||
2658 | sp_rt = addrconf_dst_alloc(idev, &sp_ifa->addr, 0); | 2661 | sp_rt = addrconf_dst_alloc(idev, &sp_ifa->addr, 0); |
2659 | 2662 | ||
2660 | /* Failure cases are ignored */ | 2663 | /* Failure cases are ignored */ |