diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-09 01:30:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-09 01:30:17 +0200 |
| commit | 7c3ceb4a409e2b838700edf081d61a8a4c921e79 (patch) | |
| tree | 4dbf54cc23d2796b278e22fc6f5460b9b451c956 /net/ipv6 | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville... (diff) | |
| parent | ipv6: fix race between ipv6_del_addr and DAD timer (diff) | |
| download | linux-7c3ceb4a409e2b838700edf081d61a8a4c921e79.tar.xz linux-7c3ceb4a409e2b838700edf081d61a8a4c921e79.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-3945.c
net/mac80211/mlme.c
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/addrconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 2ec73e62202c..8572cb05fc21 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -774,12 +774,12 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp) } write_unlock_bh(&idev->lock); + addrconf_del_timer(ifp); + ipv6_ifa_notify(RTM_DELADDR, ifp); atomic_notifier_call_chain(&inet6addr_chain, NETDEV_DOWN, ifp); - addrconf_del_timer(ifp); - /* * Purge or update corresponding prefix * |