korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 20:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 1532b97784.

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>
This commit is contained in:
Vladimir Oltean 2021-02-05 15:37:12 +02:00 committed by Jakub Kicinski
parent c0a8a9c274
commit ea92000d54
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/core/netpoll.c
View File

@ -29,7 +29,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <net/dsa.h>
#include <net/tcp.h> #include <net/tcp.h>
#include <net/udp.h> #include <net/udp.h>
#include <net/addrconf.h> #include <net/addrconf.h>
@ -658,15 +657,15 @@ EXPORT_SYMBOL_GPL(__netpoll_setup);
int netpoll_setup(struct netpoll *np) int netpoll_setup(struct netpoll *np)
{ {
struct net_device *ndev = NULL, *dev = NULL; struct net_device *ndev = NULL;
struct net *net = current->nsproxy->net_ns;
struct in_device *in_dev; struct in_device *in_dev;
int err; int err;
rtnl_lock(); 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); ndev = __dev_get_by_name(net, np->dev_name);
}
if (!ndev) { if (!ndev) {
np_err(np, "%s doesn't exist, aborting\n", np->dev_name); np_err(np, "%s doesn't exist, aborting\n", np->dev_name);
err = -ENODEV; err = -ENODEV;
@ -674,19 +673,6 @@ int netpoll_setup(struct netpoll *np)
} }
dev_hold(ndev); 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)) { if (netdev_master_upper_dev_get(ndev)) {
np_err(np, "%s is a slave device, aborting\n", np->dev_name); np_err(np, "%s is a slave device, aborting\n", np->dev_name);
err = -EBUSY; err = -EBUSY;