forcedeth: Account for consumed budget in napi poll

[net-next-2.6.git] / drivers / net / forcedeth.c

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index f9e1dd48ac56a8e562dfd0962e72f600bb8b5882..e282d0ae6a3dcb14b80db8fdd80f674c92091b6d 100644 (file)
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -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);
                        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);
                } else {
                        spin_lock_irqsave(&np->lock, flags);
                        tx_work += nv_tx_done_optimized(dev, np->tx_ring_size);
                        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);
                }
        } while (retcode == 0 &&