diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2014-03-14 20:45:17 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-03-17 15:47:22 -0400 |
| commit | 9852fbec2c95b6e168c55e97e6051b99aead6f31 (patch) | |
| tree | 12fd8bc7a669d93646c22786517c68fd0b3efdf4 /net/core/netpoll.c | |
| parent | netpoll: move setting of NETPOLL_RX_DROP into netpoll_poll_dev (diff) | |
| download | linux-dev-9852fbec2c95b6e168c55e97e6051b99aead6f31.tar.xz linux-dev-9852fbec2c95b6e168c55e97e6051b99aead6f31.zip | |
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: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/netpoll.c')
| -rw-r--r-- | net/core/netpoll.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index ef4f45df539f..147c75855c9b 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -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; |