Commit 3ce62a84 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller

ipv6: exit early in addrconf_notify() if IPv6 is disabled

If IPv6 is explicitly disabled before the interface comes up,
it makes no sense to continue when it comes up, even just
print a message.

(I am not sure about other cases though, so I prefer not to touch)
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4361eb66
...@@ -2844,6 +2844,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, ...@@ -2844,6 +2844,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
if (dev->flags & IFF_SLAVE) if (dev->flags & IFF_SLAVE)
break; break;
if (idev && idev->cnf.disable_ipv6)
break;
if (event == NETDEV_UP) { if (event == NETDEV_UP) {
if (!addrconf_qdisc_ok(dev)) { if (!addrconf_qdisc_ok(dev)) {
/* device is not ready yet. */ /* device is not ready yet. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment