From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brian Haley Subject: Re: [PATCH] Fix 2.6.34-rc1 regression in disable_ipv6 support Date: Thu, 09 Dec 2010 10:28:10 -0500 Message-ID: <4D00F58A.2050307@hp.com> References: <4CFD0AF0.9090809@hp.com> <4D000B6D.1060708@hp.com> <20101208154932.5bc4b254@nehalam> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: David Miller , netdev@vger.kernel.org, Mahesh Kelkar , Lorenzo Colitti , YOSHIFUJI Hideaki , Stephen Hemminger , stable@kernel.org To: "Eric W. Biederman" Return-path: Received: from g4t0016.houston.hp.com ([15.201.24.19]:28249 "EHLO g4t0016.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756185Ab0LIP2L (ORCPT ); Thu, 9 Dec 2010 10:28:11 -0500 In-Reply-To: Sender: netdev-owner@vger.kernel.org List-ID: On 12/08/2010 11:16 PM, Eric W. Biederman wrote: > Finding the real bug is beyond me right now, but fixing the regression > in disable_ipv6 is simple. We can just delete ::1 when we bring down > the loopback interface, and it will be restored automatically when we > bring the loopback interface back up. Hi Eric, This would work as well, same check, different way. Signed-off-by: Brian Haley diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 23cc8e1..5d16a9d 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2728,7 +2728,8 @@ static int addrconf_ifdown(struct net_device *dev, int how) and not link-local, then retain it. */ if (!how && (ifa->flags&IFA_F_PERMANENT) && - !(ipv6_addr_type(&ifa->addr) & IPV6_ADDR_LINKLOCAL)) { + !(ipv6_addr_type(&ifa->addr) & + (IPV6_ADDR_LINKLOCAL|IPV6_ADDR_LOOPBACK))) { list_move_tail(&ifa->if_list, &keep_list); /* If not doing DAD on this address, just keep it. */