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

Commit 9852fbec authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

netpoll: Pass budget into poll_napi 



This moves the control logic to the top level in netpoll_poll_dev
instead of having it dispersed throughout netpoll_poll_dev,
poll_napi and poll_one_napi.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b249b51b

net/core/netpoll.c

+3 −3
Original line number Diff line number Diff line
@@ -165,10 +165,9 @@ static int poll_one_napi(struct napi_struct *napi, int budget) 
	return budget - work;

}



static void poll_napi(struct net_device *dev)

static void poll_napi(struct net_device *dev, int budget)

{

	struct napi_struct *napi;

	int budget = 16;



	list_for_each_entry(napi, &dev->napi_list, dev_list) {

		if (napi->poll_owner != smp_processor_id() &&
@@ -196,6 +195,7 @@ static void netpoll_poll_dev(struct net_device *dev) 
{

	const struct net_device_ops *ops;

	struct netpoll_info *ni = rcu_dereference_bh(dev->npinfo);

	int budget = 16;



	/* Don't do any rx activity if the dev_lock mutex is held

	 * the dev_open/close paths use this to block netpoll activity
@@ -221,7 +221,7 @@ static void netpoll_poll_dev(struct net_device *dev) 
	/* Process pending work on NIC */

	ops->ndo_poll_controller(dev);



	poll_napi(dev);

	poll_napi(dev, budget);



	atomic_dec(&trapped);

	ni->rx_flags &= ~NETPOLL_RX_DROP;