Commit 3ce62a84 authored Sep 11, 2014 by WANG Cong Committed by David S. Miller Sep 13, 2014

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: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 4361eb66

net/ipv6/addrconf.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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. */

Admin message