This patch adds a limit to how much tx work can be done in each iteration of tx processing.

Signed-Off-By: Ayaz Abdulla <[EMAIL PROTECTED]>

--- orig/drivers/net/forcedeth.c        2007-01-08 20:34:35.000000000 -0500
+++ new/drivers/net/forcedeth.c 2007-01-08 20:35:22.000000000 -0500
@@ -1859,14 +1859,15 @@
        }
 }
 
-static void nv_tx_done_optimized(struct net_device *dev)
+static void nv_tx_done_optimized(struct net_device *dev, int limit)
 {
        struct fe_priv *np = netdev_priv(dev);
        u32 flags;
        struct ring_desc_ex* orig_get_tx = np->get_tx.ex;
 
        while ((np->get_tx.ex != np->put_tx.ex) &&
-              !((flags = le32_to_cpu(np->get_tx.ex->flaglen)) & NV_TX_VALID)) {
+              !((flags = le32_to_cpu(np->get_tx.ex->flaglen)) & NV_TX_VALID) &&
+              (limit-- > 0)) {
 
                dprintk(KERN_DEBUG "%s: nv_tx_done_optimized: flags 0x%x.\n",
                                        dev->name, flags);
@@ -1973,7 +1974,7 @@
        if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2)
                nv_tx_done(dev);
        else
-               nv_tx_done_optimized(dev);
+               nv_tx_done_optimized(dev, np->tx_ring_size);
 
        /* 3) if there are dead entries: clear everything */
        if (np->get_tx_ctx != np->put_tx_ctx) {
@@ -2899,7 +2900,7 @@
                        break;
 
                spin_lock(&np->lock);
-               nv_tx_done_optimized(dev);
+               nv_tx_done_optimized(dev, TX_WORK_PER_LOOP);
                spin_unlock(&np->lock);
 
 #ifdef CONFIG_FORCEDETH_NAPI
@@ -3006,7 +3007,7 @@
                        break;
 
                spin_lock_irqsave(&np->lock, flags);
-               nv_tx_done_optimized(dev);
+               nv_tx_done_optimized(dev, TX_WORK_PER_LOOP);
                spin_unlock_irqrestore(&np->lock, flags);
 
                if (unlikely(events & (NVREG_IRQ_TX_ERR))) {

Reply via email to