2 files changed, 3 insertions, 10 deletions

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 6a5e6e4b142c..adf273f8ad2e 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1147,12 +1147,8 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,
                          void *ptr)
 {
         struct net_device *dev = ptr;
-        struct in_device *in_dev;
-
-        if (event == NETDEV_UNREGISTER_FINAL)
-                goto out;
+        struct in_device *in_dev = __in_dev_get_rtnl(dev);
 
-        in_dev = __in_dev_get_rtnl(dev);
         ASSERT_RTNL();
 
         if (!in_dev) {
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index fd7d9ae64f16..acdee325d972 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -1050,9 +1050,6 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
                 return NOTIFY_DONE;
         }
 
-        if (event == NETDEV_UNREGISTER_FINAL)
-                return NOTIFY_DONE;
-
         in_dev = __in_dev_get_rtnl(dev);
 
         switch (event) {
@@ -1064,14 +1061,14 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
                 fib_sync_up(dev);
 #endif
                 atomic_inc(&net->ipv4.dev_addr_genid);
-                rt_cache_flush(dev_net(dev), -1);
+                rt_cache_flush(net, -1);
                 break;
         case NETDEV_DOWN:
                 fib_disable_ip(dev, 0, 0);
                 break;
         case NETDEV_CHANGEMTU:
         case NETDEV_CHANGE:
-                rt_cache_flush(dev_net(dev), 0);
+                rt_cache_flush(net, 0);
                 break;
         }
         return NOTIFY_DONE;