Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / net / ipv4 / ipconfig.c

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 66c2fe602810e7233fe7ff2c8f764f7b8b18eebc..071a785c65eb7ab5eef6294888e253ef39f45c45 100644 (file)
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -306,7 +306,7 @@ static void __init ic_close_devs(void)
        while ((d = next)) {
                next = d->next;
                dev = d->dev;
-               if (dev != ic_dev->dev && !netdev_uses_dsa(dev)) {
+               if ((!ic_dev || dev != ic_dev->dev) && !netdev_uses_dsa(dev)) {
                        pr_debug("IP-Config: Downing %s\n", dev->name);
                        dev_change_flags(dev, d->flags);
                }
@@ -1530,12 +1530,14 @@ static int __init ip_auto_config(void)
         * Close all network devices except the device we've
         * autoconfigured and set up routes.
         */
-       ic_close_devs();
        if (ic_setup_if() < 0 || ic_setup_routes() < 0)
-               return -1;
+               err = -1;
+       else
+               err = 0;
 
+       ic_close_devs();
 
-       return 0;
+       return err;
 }
 
 late_initcall(ip_auto_config);