From: Andrew Lunn <andrew@lunn.ch>
Date: Thu, 3 Dec 2015 20:12:32 +0000 (+0100)
Subject: ipv6: Only act upon NETDEV_*_TYPE_CHANGE if we have ipv6 addresses
X-Git-Tag: v4.5-rc1~128^2~205^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3ef0952ca85e28226b09a6d833c30e3e604a63c8;p=karo-tx-linux.git

ipv6: Only act upon NETDEV_*_TYPE_CHANGE if we have ipv6 addresses

An interface changing type may not have IPv6 addresses. Don't
call the address configuration type change in this case.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 6936d0d8c6b1..5e9111da449d 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3287,7 +3287,8 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
 
 	case NETDEV_PRE_TYPE_CHANGE:
 	case NETDEV_POST_TYPE_CHANGE:
-		addrconf_type_change(dev, event);
+		if (idev)
+			addrconf_type_change(dev, event);
 		break;
 	}