drivers/net: Use kcalloc or kzalloc

[safe/jmp/linux-2.6] / drivers / net / forcedeth.c

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index f9e1dd4..268ea4d 100644 (file)
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -2214,7 +2214,6 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
                dprintk("\n");
        }
 
-       dev->trans_start = jiffies;
        writel(NVREG_TXRXCTL_KICK|np->txrxctl_bits, get_hwbase(dev) + NvRegTxRxControl);
        return NETDEV_TX_OK;
 }
@@ -2369,7 +2368,6 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,
                dprintk("\n");
        }
 
-       dev->trans_start = jiffies;
        writel(NVREG_TXRXCTL_KICK|np->txrxctl_bits, get_hwbase(dev) + NvRegTxRxControl);
        return NETDEV_TX_OK;
 }
@@ -3564,14 +3562,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 &&