diff options
Diffstat (limited to 'net/ipv4/ipconfig.c')
| -rw-r--r-- | net/ipv4/ipconfig.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 7fa18bc7e47f..b26376ef87f6 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c | |||
| @@ -209,9 +209,9 @@ static int __init ic_open_devs(void) | |||
| 209 | last = &ic_first_dev; | 209 | last = &ic_first_dev; |
| 210 | rtnl_lock(); | 210 | rtnl_lock(); |
| 211 | 211 | ||
| 212 | /* bring loopback device up first */ | 212 | /* bring loopback and DSA master network devices up first */ |
| 213 | for_each_netdev(&init_net, dev) { | 213 | for_each_netdev(&init_net, dev) { |
| 214 | if (!(dev->flags & IFF_LOOPBACK)) | 214 | if (!(dev->flags & IFF_LOOPBACK) && !netdev_uses_dsa(dev)) |
| 215 | continue; | 215 | continue; |
| 216 | if (dev_change_flags(dev, dev->flags | IFF_UP) < 0) | 216 | if (dev_change_flags(dev, dev->flags | IFF_UP) < 0) |
| 217 | pr_err("IP-Config: Failed to open %s\n", dev->name); | 217 | pr_err("IP-Config: Failed to open %s\n", dev->name); |
| @@ -306,7 +306,7 @@ static void __init ic_close_devs(void) | |||
| 306 | while ((d = next)) { | 306 | while ((d = next)) { |
| 307 | next = d->next; | 307 | next = d->next; |
| 308 | dev = d->dev; | 308 | dev = d->dev; |
| 309 | if (dev != ic_dev) { | 309 | if (dev != ic_dev && !netdev_uses_dsa(dev)) { |
| 310 | DBG(("IP-Config: Downing %s\n", dev->name)); | 310 | DBG(("IP-Config: Downing %s\n", dev->name)); |
| 311 | dev_change_flags(dev, d->flags); | 311 | dev_change_flags(dev, d->flags); |
| 312 | } | 312 | } |
