Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 727ceaa4 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by David S. Miller
Browse files

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



This reverts commit 543e3a8d.

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: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aa4f069e

net/core/netpoll.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -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();