Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 23:51:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

forcedeth: Account for consumed budget in napi poll

Browse Source 
Repeated calls to nv_rx_process in napi poll routine do not take
portion of budget that has been consumed in previous calls.  Fix by
subtracting the number of packets processed.

Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tom Herbert 2010-05-05 18:15:21 +00:00 committed by David S. Miller
parent 0294b6f78f
commit d951f72503
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/forcedeth.c
View File

@ -3564,14 +3564,15 @@ static int nv_napi_poll(struct napi_struct *napi, int budget)
tx_work += nv_tx_done(dev, np->tx_ring_size); tx_work += nv_tx_done(dev, np->tx_ring_size);
spin_unlock_irqrestore(&np->lock, flags); spin_unlock_irqrestore(&np->lock, flags);
rx_count = nv_rx_process(dev, budget); rx_count = nv_rx_process(dev, budget - rx_work);
retcode = nv_alloc_rx(dev); retcode = nv_alloc_rx(dev);
} else { } else {
spin_lock_irqsave(&np->lock, flags); spin_lock_irqsave(&np->lock, flags);
tx_work += nv_tx_done_optimized(dev, np->tx_ring_size); tx_work += nv_tx_done_optimized(dev, np->tx_ring_size);
spin_unlock_irqrestore(&np->lock, flags); spin_unlock_irqrestore(&np->lock, flags);
rx_count = nv_rx_process_optimized(dev, budget); rx_count = nv_rx_process_optimized(dev,
budget - rx_work);
retcode = nv_alloc_rx_optimized(dev); retcode = nv_alloc_rx_optimized(dev);
} }
} while (retcode == 0 && } while (retcode == 0 &&