net: remove delay at device dismantle

[mirror_ubuntu-artful-kernel.git] / net / ipv4 / devinet.c

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index adf273f8ad2eb28a658321c68967bb2e6ccf25a0..6a5e6e4b142c98393391013911824c8821d98167 100644 (file)
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1147,8 +1147,12 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,
                         void *ptr)
 {
        struct net_device *dev = ptr;
-       struct in_device *in_dev = __in_dev_get_rtnl(dev);
+       struct in_device *in_dev;
 
+       if (event == NETDEV_UNREGISTER_FINAL)
+               goto out;
+
+       in_dev = __in_dev_get_rtnl(dev);
        ASSERT_RTNL();
 
        if (!in_dev) {