From patchwork Thu Dec 9 15:28:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Haley X-Patchwork-Id: 74909 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 365A4B70A7 for ; Fri, 10 Dec 2010 02:28:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756602Ab0LIP2M (ORCPT ); Thu, 9 Dec 2010 10:28:12 -0500 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 Received: from g4t0018.houston.hp.com (g4t0018.houston.hp.com [16.234.32.27]) by g4t0016.houston.hp.com (Postfix) with ESMTP id AE44814034; Thu, 9 Dec 2010 15:28:10 +0000 (UTC) Received: from [16.117.217.135] (spaceshipone.americas.hpqcorp.net [16.117.217.135]) by g4t0018.houston.hp.com (Postfix) with ESMTP id 7130A10059; Thu, 9 Dec 2010 15:28:09 +0000 (UTC) Message-ID: <4D00F58A.2050307@hp.com> Date: Thu, 09 Dec 2010 10:28:10 -0500 From: Brian Haley Organization: Open Source and Linux Organization User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.15) Gecko/20101027 Lightning/1.0b1 Thunderbird/3.0.10 MIME-Version: 1.0 To: "Eric W. Biederman" CC: David Miller , netdev@vger.kernel.org, Mahesh Kelkar , Lorenzo Colitti , YOSHIFUJI Hideaki , Stephen Hemminger , stable@kernel.org Subject: Re: [PATCH] Fix 2.6.34-rc1 regression in disable_ipv6 support References: <4CFD0AF0.9090809@hp.com> <4D000B6D.1060708@hp.com> <20101208154932.5bc4b254@nehalam> In-Reply-To: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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. */