diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-02-04 15:25:00 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-05 16:11:57 -0500 |
| commit | 3d1a6333d90167f2b196f2cc0c2a988a10eb76c5 (patch) | |
| tree | 3ddfae0a8bb6fe6ffb839fcac39b060a9222d516 /drivers/net/ethernet/ibm | |
| parent | 0eb7b85c9669fce5ebf22915ee5f93b6d721256e (diff) | |
| download | blackbird-obmc-linux-3d1a6333d90167f2b196f2cc0c2a988a10eb76c5.tar.gz blackbird-obmc-linux-3d1a6333d90167f2b196f2cc0c2a988a10eb76c5.zip | |
ibm/emac: use napi_complete_done()
Use napi_complete_done() instead of __napi_complete()
We plan to remove __napi_complete() to reduce NAPI complexity.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ibm')
| -rw-r--r-- | drivers/net/ethernet/ibm/emac/mal.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c index aaf6fec566b5..cd3227b088b7 100644 --- a/drivers/net/ethernet/ibm/emac/mal.c +++ b/drivers/net/ethernet/ibm/emac/mal.c @@ -421,20 +421,20 @@ static int mal_poll(struct napi_struct *napi, int budget) int n; if (unlikely(test_bit(MAL_COMMAC_POLL_DISABLED, &mc->flags))) continue; - n = mc->ops->poll_rx(mc->dev, budget); + n = mc->ops->poll_rx(mc->dev, budget - received); if (n) { received += n; - budget -= n; - if (budget <= 0) - goto more_work; // XXX What if this is the last one ? + if (received >= budget) + return budget; } } - /* We need to disable IRQs to protect from RXDE IRQ here */ - spin_lock_irqsave(&mal->lock, flags); - __napi_complete(napi); - mal_enable_eob_irq(mal); - spin_unlock_irqrestore(&mal->lock, flags); + if (napi_complete_done(napi, received)) { + /* We need to disable IRQs to protect from RXDE IRQ here */ + spin_lock_irqsave(&mal->lock, flags); + mal_enable_eob_irq(mal); + spin_unlock_irqrestore(&mal->lock, flags); + } /* Check for "rotting" packet(s) */ list_for_each(l, &mal->poll_list) { |
