Revert "net: Have netpoll bring-up DSA management interface"

This reverts commit 1532b9778478577152201adbafa7738b1e844868.

The above commit is good and it works, however it was meant as a bugfix
for stable kernels and now we have more self-contained ways in DSA to
handle the situation where the DSA master must be brought up.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 960948290001eed4d07a8d20327e9158659adc45..c310c7c1cef7f21538d248926aab6303cecf68b0 100644 (file)
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -29,7 +29,6 @@
 #include <linux/slab.h>
 #include <linux/export.h>
 #include <linux/if_vlan.h>
-#include <net/dsa.h>
 #include <net/tcp.h>
 #include <net/udp.h>
 #include <net/addrconf.h>
@@ -658,15 +657,15 @@ EXPORT_SYMBOL_GPL(__netpoll_setup);
 
 int netpoll_setup(struct netpoll *np)
 {
-       struct net_device *ndev = NULL, *dev = NULL;
-       struct net *net = current->nsproxy->net_ns;
+       struct net_device *ndev = NULL;
        struct in_device *in_dev;
        int err;
 
        rtnl_lock();
-       if (np->dev_name[0])
+       if (np->dev_name[0]) {
+               struct net *net = current->nsproxy->net_ns;
                ndev = __dev_get_by_name(net, np->dev_name);
-
+       }
        if (!ndev) {
                np_err(np, "%s doesn't exist, aborting\n", np->dev_name);
                err = -ENODEV;
@@ -674,19 +673,6 @@ int netpoll_setup(struct netpoll *np)
        }
        dev_hold(ndev);
 
-       /* bring up DSA management network devices up first */
-       for_each_netdev(net, dev) {
-               if (!netdev_uses_dsa(dev))
-                       continue;
-
-               err = dev_change_flags(dev, dev->flags | IFF_UP, NULL);
-               if (err < 0) {
-                       np_err(np, "%s failed to open %s\n",
-                              np->dev_name, dev->name);
-                       goto put;
-               }
-       }
-
        if (netdev_master_upper_dev_get(ndev)) {
                np_err(np, "%s is a slave device, aborting\n", np->dev_name);
                err = -EBUSY;