[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4B7173CB.3020506@hp.com>
Date: Tue, 09 Feb 2010 09:40:11 -0500
From: Brian Haley <brian.haley@...com>
To: Stephen Hemminger <shemminger@...tta.com>
CC: David Miller <davem@...emloft.net>,
YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@...ux-ipv6.org>,
netdev@...r.kernel.org
Subject: Re: [PATCH 1/2] IPv6: keep permanent addresses on admin down
Stephen Hemminger wrote:
> @@ -2686,18 +2687,30 @@ static int addrconf_ifdown(struct net_de
> write_lock_bh(&idev->lock);
> }
> #endif
> - while ((ifa = idev->addr_list) != NULL) {
> - idev->addr_list = ifa->if_next;
> - ifa->if_next = NULL;
> - ifa->dead = 1;
> - addrconf_del_timer(ifa);
> - write_unlock_bh(&idev->lock);
> -
> - __ipv6_ifa_notify(RTM_DELADDR, ifa);
> - atomic_notifier_call_chain(&inet6addr_chain, NETDEV_DOWN, ifa);
> - in6_ifa_put(ifa);
> + bifa = &idev->addr_list;
> + while ((ifa = *bifa) != NULL) {
> + if (how == 0 && (ifa->flags&IFA_F_PERMANENT)) {
> + /* Retain permanent address on admin down */
> + bifa = &ifa->if_next;
> +
> + /* Restart DAD if needed when link comes back up */
> + if ( !((dev->flags&(IFF_NOARP|IFF_LOOPBACK)) ||
> + idev->cnf.accept_dad <= 0 ||
> + (ifa->flags & IFA_F_NODAD)))
> + ifa->flags |= IFA_F_TENTATIVE;
> + } else {
> + *bifa = ifa->if_next;
> + ifa->if_next = NULL;
> +
> + ifa->dead = 1;
> + write_unlock_bh(&idev->lock);
> +
> + __ipv6_ifa_notify(RTM_DELADDR, ifa);
> + atomic_notifier_call_chain(&inet6addr_chain, NETDEV_DOWN, ifa);
> + in6_ifa_put(ifa);
>
> - write_lock_bh(&idev->lock);
> + write_lock_bh(&idev->lock);
> + }
What about addrconf_del_timer()? It didn't seem to make it to this else{} from
the original.
-Brian
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists