Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[linux-2.6-omap-h63xx.git] / drivers / net / atl1e / atl1e_main.c

diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index 98b2a7a466b8c3f9377a1812ab551f0c59000995..bb9094d4cbc9014f2686033162cfde22fcc0d972 100644 (file)
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -1326,9 +1326,9 @@ static irqreturn_t atl1e_intr(int irq, void *data)
                        AT_WRITE_REG(hw, REG_IMR,
                                     IMR_NORMAL_MASK & ~ISR_RX_EVENT);
                        AT_WRITE_FLUSH(hw);
-                       if (likely(netif_rx_schedule_prep(netdev,
+                       if (likely(netif_rx_schedule_prep(
                                   &adapter->napi)))
-                               __netif_rx_schedule(netdev, &adapter->napi);
+                               __netif_rx_schedule(&adapter->napi);
                }
        } while (--max_ints > 0);
        /* re-enable Interrupt*/
@@ -1501,7 +1501,6 @@ static int atl1e_clean(struct napi_struct *napi, int budget)
 {
        struct atl1e_adapter *adapter =
                        container_of(napi, struct atl1e_adapter, napi);
-       struct net_device *netdev  = adapter->netdev;
        struct pci_dev    *pdev    = adapter->pdev;
        u32 imr_data;
        int work_done = 0;
@@ -1515,7 +1514,7 @@ static int atl1e_clean(struct napi_struct *napi, int budget)
        /* If no Tx and not enough Rx work done, exit the polling mode */
        if (work_done < budget) {
 quit_polling:
-               netif_rx_complete(netdev, napi);
+               netif_rx_complete(napi);
                imr_data = AT_READ_REG(&adapter->hw, REG_IMR);
                AT_WRITE_REG(&adapter->hw, REG_IMR, imr_data | ISR_RX_EVENT);
                /* test debug */