Merge branch 'linus' into sched/core, to resolve conflicts

[karo-tx-linux.git] / net / ipv4 / fib_frontend.c

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index d846304b7b89d619d53609c5e435b3ddcc3e2d84..c7539e22868b37d59018730aca786176df5408ee 100644 (file)
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -1047,6 +1047,8 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
        }
 
        in_dev = __in_dev_get_rtnl(dev);
+       if (!in_dev)
+               return NOTIFY_DONE;
 
        switch (event) {
        case NETDEV_UP: