summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-04-05 15:58:22 -0500
committerDavid S. Miller <davem@davemloft.net>2016-04-05 19:34:44 -0400
commit727ceaa49bb86518470c19640ed7f067c5aa9485 (patch)
tree4ec8ebb890e54e50e6a4f4057622d6957048d0b4 /net/core
parentaa4f069e167b8302b0ccf920bca389a1fbe2bc4a (diff)
downloadblackbird-op-linux-727ceaa49bb86518470c19640ed7f067c5aa9485.tar.gz
blackbird-op-linux-727ceaa49bb86518470c19640ed7f067c5aa9485.zip
Revert "netpoll: Fix extra refcount release in netpoll_cleanup()"
This reverts commit 543e3a8da5a4c453e992d5351ef405d5e32f27d7. 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>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/netpoll.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index a57bd17805b4..94acfc89ad97 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -603,6 +603,7 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev)
const struct net_device_ops *ops;
int err;
+ np->dev = ndev;
strlcpy(np->dev_name, ndev->name, IFNAMSIZ);
INIT_WORK(&np->cleanup_work, netpoll_async_cleanup);
@@ -669,7 +670,6 @@ int netpoll_setup(struct netpoll *np)
goto unlock;
}
dev_hold(ndev);
- np->dev = ndev;
if (netdev_master_upper_dev_get(ndev)) {
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;
put:
- np->dev = NULL;
dev_put(ndev);
unlock:
rtnl_unlock();
OpenPOWER on IntegriCloud