summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-03-27 14:31:52 -0700
committerDavid S. Miller <davem@davemloft.net>2007-03-27 14:31:52 -0700
commit53aadcc90931dfa150f76ce9a5f9e8f3e43d57df (patch)
treefe2029e1a5bc03250b365bfe544940957ffefc8a
parentc38c83cb705a41e30a99545ae2314c00e3b9bf1c (diff)
downloadlinux-3.10-53aadcc90931dfa150f76ce9a5f9e8f3e43d57df.tar.gz
linux-3.10-53aadcc90931dfa150f76ce9a5f9e8f3e43d57df.tar.bz2
linux-3.10-53aadcc90931dfa150f76ce9a5f9e8f3e43d57df.zip
[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>
-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 1b616992d91..7552663aa12 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)
}
#endif
+ if (netif_running(dev) && netif_carrier_ok(dev))
+ ndev->if_flags |= IF_READY;
+
ipv6_mc_init_dev(ndev);
ndev->tstamp = jiffies;
#ifdef CONFIG_SYSCTL