fib_trie: Fix RCU bug and merge similar bits of inflate/halve

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

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 7fa18bc7e47fd3199c18247f19390d61f6e83013..b26376ef87f616d249dbfebbd6705eb818fefd05 100644 (file)
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -209,9 +209,9 @@ static int __init ic_open_devs(void)
        last = &ic_first_dev;
        rtnl_lock();
 
-       /* bring loopback device up first */
+       /* bring loopback and DSA master network devices up first */
        for_each_netdev(&init_net, dev) {
-               if (!(dev->flags & IFF_LOOPBACK))
+               if (!(dev->flags & IFF_LOOPBACK) && !netdev_uses_dsa(dev))
                        continue;
                if (dev_change_flags(dev, dev->flags | IFF_UP) < 0)
                        pr_err("IP-Config: Failed to open %s\n", dev->name);
@@ -306,7 +306,7 @@ static void __init ic_close_devs(void)
        while ((d = next)) {
                next = d->next;
                dev = d->dev;
-               if (dev != ic_dev) {
+               if (dev != ic_dev && !netdev_uses_dsa(dev)) {
                        DBG(("IP-Config: Downing %s\n", dev->name));
                        dev_change_flags(dev, d->flags);
                }