hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "netpoll: Fix extra refcount release in netpoll_cleanup()" 

This reverts commit 543e3a8da5.

Direct callers of __netpoll_setup() depend on it to set np->dev,
so we can't simply move that assignment up to netpoll_stup().

Reported-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Bjorn Helgaas 2016-04-05 15:58:22 -05:00 committed by David S. Miller
parent aa4f069e16
commit 727ceaa49b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/core/netpoll.c
View File

@ -603,6 +603,7 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev)
const struct net_device_ops *ops; const struct net_device_ops *ops;
int err; int err;
np->dev = ndev;
strlcpy(np->dev_name, ndev->name, IFNAMSIZ); strlcpy(np->dev_name, ndev->name, IFNAMSIZ);
INIT_WORK(&np->cleanup_work, netpoll_async_cleanup); INIT_WORK(&np->cleanup_work, netpoll_async_cleanup);
@ -669,7 +670,6 @@ int netpoll_setup(struct netpoll *np)
goto unlock; goto unlock;
} }
dev_hold(ndev); dev_hold(ndev);
np->dev = ndev;
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);
@ -770,7 +770,6 @@ int netpoll_setup(struct netpoll *np)
return 0; return 0;
put: put:
np->dev = NULL;
dev_put(ndev); dev_put(ndev);
unlock: unlock:
rtnl_unlock(); rtnl_unlock();