diff options
author | Neil Horman <nhorman@tuxdriver.com> | 2008-12-22 23:43:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-22 23:43:12 -0500 |
commit | 908a7a16b852ffd618a9127be8d62432182d81b4 (patch) | |
tree | a0b509227e26bef7edd347575761e0dbeb5756e7 /drivers/net/atl1e | |
parent | 889bd9b6dbcd426b8698c4a779dd7dbf247f57b8 (diff) |
net: Remove unused netdev arg from some NAPI interfaces.
When the napi api was changed to separate its 1:1 binding to the net_device
struct, the netif_rx_[prep|schedule|complete] api failed to remove the now
vestigual net_device structure parameter. This patch cleans up that api by
properly removing it..
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/atl1e')
-rw-r--r-- | drivers/net/atl1e/atl1e_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index 98b2a7a466b8..a72a46145ed7 100644 --- 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) | |||
1326 | AT_WRITE_REG(hw, REG_IMR, | 1326 | AT_WRITE_REG(hw, REG_IMR, |
1327 | IMR_NORMAL_MASK & ~ISR_RX_EVENT); | 1327 | IMR_NORMAL_MASK & ~ISR_RX_EVENT); |
1328 | AT_WRITE_FLUSH(hw); | 1328 | AT_WRITE_FLUSH(hw); |
1329 | if (likely(netif_rx_schedule_prep(netdev, | 1329 | if (likely(netif_rx_schedule_prep( |
1330 | &adapter->napi))) | 1330 | &adapter->napi))) |
1331 | __netif_rx_schedule(netdev, &adapter->napi); | 1331 | __netif_rx_schedule(&adapter->napi); |
1332 | } | 1332 | } |
1333 | } while (--max_ints > 0); | 1333 | } while (--max_ints > 0); |
1334 | /* re-enable Interrupt*/ | 1334 | /* re-enable Interrupt*/ |
@@ -1515,7 +1515,7 @@ static int atl1e_clean(struct napi_struct *napi, int budget) | |||
1515 | /* If no Tx and not enough Rx work done, exit the polling mode */ | 1515 | /* If no Tx and not enough Rx work done, exit the polling mode */ |
1516 | if (work_done < budget) { | 1516 | if (work_done < budget) { |
1517 | quit_polling: | 1517 | quit_polling: |
1518 | netif_rx_complete(netdev, napi); | 1518 | netif_rx_complete(napi); |
1519 | imr_data = AT_READ_REG(&adapter->hw, REG_IMR); | 1519 | imr_data = AT_READ_REG(&adapter->hw, REG_IMR); |
1520 | AT_WRITE_REG(&adapter->hw, REG_IMR, imr_data | ISR_RX_EVENT); | 1520 | AT_WRITE_REG(&adapter->hw, REG_IMR, imr_data | ISR_RX_EVENT); |
1521 | /* test debug */ | 1521 | /* test debug */ |