diff options
| author | stephen hemminger <shemminger@vyatta.com> | 2010-12-16 12:42:54 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-19 01:01:17 -0500 |
| commit | d1ed113f1669390da9898da3beddcc058d938587 (patch) | |
| tree | baecf369b04cb1a6ff4cfa376ecf6301564a34d4 /net/ipv6 | |
| parent | bc3ef6605ea325e41b586a76aadc3f731c317504 (diff) | |
ipv6: remove duplicate neigh_ifdown
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/addrconf.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 99d1888af363..5b189c97c2fc 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
| @@ -2672,7 +2672,6 @@ static int addrconf_ifdown(struct net_device *dev, int how) | |||
| 2672 | /* Flush routes if device is being removed or it is not loopback */ | 2672 | /* Flush routes if device is being removed or it is not loopback */ |
| 2673 | if (how || !(dev->flags & IFF_LOOPBACK)) | 2673 | if (how || !(dev->flags & IFF_LOOPBACK)) |
| 2674 | rt6_ifdown(net, dev); | 2674 | rt6_ifdown(net, dev); |
| 2675 | neigh_ifdown(&nd_tbl, dev); | ||
| 2676 | 2675 | ||
| 2677 | idev = __in6_dev_get(dev); | 2676 | idev = __in6_dev_get(dev); |
| 2678 | if (idev == NULL) | 2677 | if (idev == NULL) |