aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-03-27 17:31:52 -0400
committerDavid S. Miller <davem@davemloft.net>2007-03-27 17:31:52 -0400
commit53aadcc90931dfa150f76ce9a5f9e8f3e43d57df (patch)
treefe2029e1a5bc03250b365bfe544940957ffefc8a /net
parentc38c83cb705a41e30a99545ae2314c00e3b9bf1c (diff)
[IPV6]: Set IF_READY if the device is up and has carrier
We still need to set the IF_READY flag in ipv6_add_dev for the case where all addresses (including the link-local) are deleted and then recreated. In that case the IPv6 device too will be destroyed and then recreated. In order to prevent the original problem, we simply ensure that the device is up before setting IF_READY. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/addrconf.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 1b616992d916..7552663aa125 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -342,6 +342,9 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
342 } 342 }
343#endif 343#endif
344 344
345 if (netif_running(dev) && netif_carrier_ok(dev))
346 ndev->if_flags |= IF_READY;
347
345 ipv6_mc_init_dev(ndev); 348 ipv6_mc_init_dev(ndev);
346 ndev->tstamp = jiffies; 349 ndev->tstamp = jiffies;
347#ifdef CONFIG_SYSCTL 350#ifdef CONFIG_SYSCTL