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/igb | |
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/igb')
-rw-r--r-- | drivers/net/igb/igb_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 25df7c931064..6a40d9486daf 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -3347,8 +3347,8 @@ static irqreturn_t igb_msix_rx(int irq, void *data) | |||
3347 | 3347 | ||
3348 | igb_write_itr(rx_ring); | 3348 | igb_write_itr(rx_ring); |
3349 | 3349 | ||
3350 | if (netif_rx_schedule_prep(adapter->netdev, &rx_ring->napi)) | 3350 | if (netif_rx_schedule_prep(&rx_ring->napi)) |
3351 | __netif_rx_schedule(adapter->netdev, &rx_ring->napi); | 3351 | __netif_rx_schedule(&rx_ring->napi); |
3352 | 3352 | ||
3353 | #ifdef CONFIG_IGB_DCA | 3353 | #ifdef CONFIG_IGB_DCA |
3354 | if (adapter->flags & IGB_FLAG_DCA_ENABLED) | 3354 | if (adapter->flags & IGB_FLAG_DCA_ENABLED) |
@@ -3500,7 +3500,7 @@ static irqreturn_t igb_intr_msi(int irq, void *data) | |||
3500 | mod_timer(&adapter->watchdog_timer, jiffies + 1); | 3500 | mod_timer(&adapter->watchdog_timer, jiffies + 1); |
3501 | } | 3501 | } |
3502 | 3502 | ||
3503 | netif_rx_schedule(netdev, &adapter->rx_ring[0].napi); | 3503 | netif_rx_schedule(&adapter->rx_ring[0].napi); |
3504 | 3504 | ||
3505 | return IRQ_HANDLED; | 3505 | return IRQ_HANDLED; |
3506 | } | 3506 | } |
@@ -3538,7 +3538,7 @@ static irqreturn_t igb_intr(int irq, void *data) | |||
3538 | mod_timer(&adapter->watchdog_timer, jiffies + 1); | 3538 | mod_timer(&adapter->watchdog_timer, jiffies + 1); |
3539 | } | 3539 | } |
3540 | 3540 | ||
3541 | netif_rx_schedule(netdev, &adapter->rx_ring[0].napi); | 3541 | netif_rx_schedule(&adapter->rx_ring[0].napi); |
3542 | 3542 | ||
3543 | return IRQ_HANDLED; | 3543 | return IRQ_HANDLED; |
3544 | } | 3544 | } |
@@ -3573,7 +3573,7 @@ static int igb_poll(struct napi_struct *napi, int budget) | |||
3573 | !netif_running(netdev)) { | 3573 | !netif_running(netdev)) { |
3574 | if (adapter->itr_setting & 3) | 3574 | if (adapter->itr_setting & 3) |
3575 | igb_set_itr(adapter); | 3575 | igb_set_itr(adapter); |
3576 | netif_rx_complete(netdev, napi); | 3576 | netif_rx_complete(napi); |
3577 | if (!test_bit(__IGB_DOWN, &adapter->state)) | 3577 | if (!test_bit(__IGB_DOWN, &adapter->state)) |
3578 | igb_irq_enable(adapter); | 3578 | igb_irq_enable(adapter); |
3579 | return 0; | 3579 | return 0; |
@@ -3599,7 +3599,7 @@ static int igb_clean_rx_ring_msix(struct napi_struct *napi, int budget) | |||
3599 | 3599 | ||
3600 | /* If not enough Rx work done, exit the polling mode */ | 3600 | /* If not enough Rx work done, exit the polling mode */ |
3601 | if ((work_done == 0) || !netif_running(netdev)) { | 3601 | if ((work_done == 0) || !netif_running(netdev)) { |
3602 | netif_rx_complete(netdev, napi); | 3602 | netif_rx_complete(napi); |
3603 | 3603 | ||
3604 | if (adapter->itr_setting & 3) { | 3604 | if (adapter->itr_setting & 3) { |
3605 | if (adapter->num_rx_queues == 1) | 3605 | if (adapter->num_rx_queues == 1) |