Merge "ipv6: don't disable interface if last ipv6 address is removed"

This commit is contained in:
Linux Build Service Account 2014-07-16 11:54:32 -07:00 committed by Gerrit - the friendly Code Review server
commit db32531d78

View File

@ -2580,12 +2580,6 @@ static int inet6_addr_del(struct net *net, int ifindex, const struct in6_addr *p
read_unlock_bh(&idev->lock);
ipv6_del_addr(ifp);
/* If the last address is deleted administratively,
disable IPv6 on this interface.
*/
if (list_empty(&idev->addr_list))
addrconf_ifdown(idev->dev, 1);
return 0;
}
}