[PATCH net-next] ipv6: remove duplicate neigh_ifdown

[PATCH net-next] ipv6: remove duplicate neigh_ifdown

[Stephen Hemminger]

When device is being set to down, neigh_ifdown was being called
twice. Once from addrconf notifier and once from ndisc notifier.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

--- a/net/ipv6/addrconf.c	2010-12-16 17:50:26.658169250 -0800
+++ b/net/ipv6/addrconf.c	2010-12-16 17:52:15.227220647 -0800
@@ -2672,7 +2672,6 @@ static int addrconf_ifdown(struct net_de
 	/* Flush routes if device is being removed or it is not loopback */
 	if (how || !(dev->flags & IFF_LOOPBACK))
 		rt6_ifdown(net, dev);
-	neigh_ifdown(&nd_tbl, dev);
 
 	idev = __in6_dev_get(dev);
 	if (idev == NULL)

Re: [PATCH net-next] ipv6: remove duplicate neigh_ifdown

[David Miller]

From: Stephen Hemminger <shemminger@vyatta.com>
Date: Thu, 16 Dec 2010 19:42:54 -0800

> When device is being set to down, neigh_ifdown was being called
> twice. Once from addrconf notifier and once from ndisc notifier.
> 
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

I'll give you a cookie if you can show me how this patch applies to
net-next-2.6 cleanly. :-)

It only matches the code in net-2.6 which has changed non-trivially in
net-next-2.6

If you worked against net-2.6 and thought "I can't think of anything
that could have changed in net-next-2.6 in this area", that's not
an appropriate way to operate and submit patches.

Please don't be so careless, thanks.

Re: [PATCH net-next] ipv6: remove duplicate neigh_ifdown

[Stephen Hemminger]

On Fri, 17 Dec 2010 09:49:16 -0800 (PST)
David Miller <davem@davemloft.net> wrote:

> From: Stephen Hemminger <shemminger@vyatta.com>
> Date: Thu, 16 Dec 2010 19:42:54 -0800
> 
> > When device is being set to down, neigh_ifdown was being called
> > twice. Once from addrconf notifier and once from ndisc notifier.
> > 
> > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
> 
> I'll give you a cookie if you can show me how this patch applies to
> net-next-2.6 cleanly. :-)
> 
> It only matches the code in net-2.6 which has changed non-trivially in
> net-next-2.6
> 
> If you worked against net-2.6 and thought "I can't think of anything
> that could have changed in net-next-2.6 in this area", that's not
> an appropriate way to operate and submit patches.
> 
> Please don't be so careless, thanks.

Ok. It followed my last patch that did the rt6_ifdown only
if not loopback. Since you accepted that, I sent the next one.



-- 

Re: [PATCH net-next] ipv6: remove duplicate neigh_ifdown

[David Miller]

From: Stephen Hemminger <shemminger@vyatta.com>
Date: Fri, 17 Dec 2010 10:01:01 -0800

> Ok. It followed my last patch that did the rt6_ifdown only
> if not loopback. Since you accepted that, I sent the next one.

I applied it to net-2.6, which is how we handle bug fixes.  The
fix naturally propagates to net-next-2.6 the next tiem I do a merge.

This is why I found it quite strange when you were talking about
net-next-2.6 wrt. that bug fix.  We never apply clear important fixes
to net-next-2.6 first, then backport it to net-2.6

If such a net-2.6 dependency exists on a net-next-2.6 patch, you just
need to let me know about it so I can do the merge before applying it.
That's all.

Re: [PATCH net-next] ipv6: remove duplicate neigh_ifdown

[David Miller]

From: Stephen Hemminger <shemminger@vyatta.com>
Date: Thu, 16 Dec 2010 19:42:54 -0800

> When device is being set to down, neigh_ifdown was being called
> twice. Once from addrconf notifier and once from ndisc notifier.
> 
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

Applied.