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/ixgbe | |
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/ixgbe')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 92b35cfc7a46..b6ae9f674ba5 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -1012,7 +1012,7 @@ static irqreturn_t ixgbe_msix_clean_rx(int irq, void *data) | |||
1012 | rx_ring = &(adapter->rx_ring[r_idx]); | 1012 | rx_ring = &(adapter->rx_ring[r_idx]); |
1013 | /* disable interrupts on this vector only */ | 1013 | /* disable interrupts on this vector only */ |
1014 | IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, rx_ring->v_idx); | 1014 | IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, rx_ring->v_idx); |
1015 | netif_rx_schedule(adapter->netdev, &q_vector->napi); | 1015 | netif_rx_schedule(&q_vector->napi); |
1016 | 1016 | ||
1017 | return IRQ_HANDLED; | 1017 | return IRQ_HANDLED; |
1018 | } | 1018 | } |
@@ -1053,7 +1053,7 @@ static int ixgbe_clean_rxonly(struct napi_struct *napi, int budget) | |||
1053 | 1053 | ||
1054 | /* If all Rx work done, exit the polling mode */ | 1054 | /* If all Rx work done, exit the polling mode */ |
1055 | if (work_done < budget) { | 1055 | if (work_done < budget) { |
1056 | netif_rx_complete(adapter->netdev, napi); | 1056 | netif_rx_complete(napi); |
1057 | if (adapter->itr_setting & 3) | 1057 | if (adapter->itr_setting & 3) |
1058 | ixgbe_set_itr_msix(q_vector); | 1058 | ixgbe_set_itr_msix(q_vector); |
1059 | if (!test_bit(__IXGBE_DOWN, &adapter->state)) | 1059 | if (!test_bit(__IXGBE_DOWN, &adapter->state)) |
@@ -1102,7 +1102,7 @@ static int ixgbe_clean_rxonly_many(struct napi_struct *napi, int budget) | |||
1102 | rx_ring = &(adapter->rx_ring[r_idx]); | 1102 | rx_ring = &(adapter->rx_ring[r_idx]); |
1103 | /* If all Rx work done, exit the polling mode */ | 1103 | /* If all Rx work done, exit the polling mode */ |
1104 | if (work_done < budget) { | 1104 | if (work_done < budget) { |
1105 | netif_rx_complete(adapter->netdev, napi); | 1105 | netif_rx_complete(napi); |
1106 | if (adapter->itr_setting & 3) | 1106 | if (adapter->itr_setting & 3) |
1107 | ixgbe_set_itr_msix(q_vector); | 1107 | ixgbe_set_itr_msix(q_vector); |
1108 | if (!test_bit(__IXGBE_DOWN, &adapter->state)) | 1108 | if (!test_bit(__IXGBE_DOWN, &adapter->state)) |
@@ -1378,13 +1378,13 @@ static irqreturn_t ixgbe_intr(int irq, void *data) | |||
1378 | 1378 | ||
1379 | ixgbe_check_fan_failure(adapter, eicr); | 1379 | ixgbe_check_fan_failure(adapter, eicr); |
1380 | 1380 | ||
1381 | if (netif_rx_schedule_prep(netdev, &adapter->q_vector[0].napi)) { | 1381 | if (netif_rx_schedule_prep(&adapter->q_vector[0].napi)) { |
1382 | adapter->tx_ring[0].total_packets = 0; | 1382 | adapter->tx_ring[0].total_packets = 0; |
1383 | adapter->tx_ring[0].total_bytes = 0; | 1383 | adapter->tx_ring[0].total_bytes = 0; |
1384 | adapter->rx_ring[0].total_packets = 0; | 1384 | adapter->rx_ring[0].total_packets = 0; |
1385 | adapter->rx_ring[0].total_bytes = 0; | 1385 | adapter->rx_ring[0].total_bytes = 0; |
1386 | /* would disable interrupts here but EIAM disabled it */ | 1386 | /* would disable interrupts here but EIAM disabled it */ |
1387 | __netif_rx_schedule(netdev, &adapter->q_vector[0].napi); | 1387 | __netif_rx_schedule(&adapter->q_vector[0].napi); |
1388 | } | 1388 | } |
1389 | 1389 | ||
1390 | return IRQ_HANDLED; | 1390 | return IRQ_HANDLED; |
@@ -2308,7 +2308,7 @@ static int ixgbe_poll(struct napi_struct *napi, int budget) | |||
2308 | 2308 | ||
2309 | /* If budget not fully consumed, exit the polling mode */ | 2309 | /* If budget not fully consumed, exit the polling mode */ |
2310 | if (work_done < budget) { | 2310 | if (work_done < budget) { |
2311 | netif_rx_complete(adapter->netdev, napi); | 2311 | netif_rx_complete(napi); |
2312 | if (adapter->itr_setting & 3) | 2312 | if (adapter->itr_setting & 3) |
2313 | ixgbe_set_itr(adapter); | 2313 | ixgbe_set_itr(adapter); |
2314 | if (!test_bit(__IXGBE_DOWN, &adapter->state)) | 2314 | if (!test_bit(__IXGBE_DOWN, &adapter->state)) |