Merge branch 'linus' into sched/devel

1 files changed, 2 insertions, 2 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 147588f4c7c0..ff61a5cdb0b3 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -749,12 +749,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
          *