diff options
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
-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 d2f4d5f508b7..7489094bbbc8 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -1015,7 +1015,7 @@ static irqreturn_t ixgbe_msix_clean_rx(int irq, void *data) | |||
1015 | rx_ring = &(adapter->rx_ring[r_idx]); | 1015 | rx_ring = &(adapter->rx_ring[r_idx]); |
1016 | /* disable interrupts on this vector only */ | 1016 | /* disable interrupts on this vector only */ |
1017 | IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, rx_ring->v_idx); | 1017 | IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, rx_ring->v_idx); |
1018 | netif_rx_schedule(&q_vector->napi); | 1018 | napi_schedule(&q_vector->napi); |
1019 | 1019 | ||
1020 | return IRQ_HANDLED; | 1020 | return IRQ_HANDLED; |
1021 | } | 1021 | } |
@@ -1056,7 +1056,7 @@ static int ixgbe_clean_rxonly(struct napi_struct *napi, int budget) | |||
1056 | 1056 | ||
1057 | /* If all Rx work done, exit the polling mode */ | 1057 | /* If all Rx work done, exit the polling mode */ |
1058 | if (work_done < budget) { | 1058 | if (work_done < budget) { |
1059 | netif_rx_complete(napi); | 1059 | napi_complete(napi); |
1060 | if (adapter->itr_setting & 3) | 1060 | if (adapter->itr_setting & 3) |
1061 | ixgbe_set_itr_msix(q_vector); | 1061 | ixgbe_set_itr_msix(q_vector); |
1062 | if (!test_bit(__IXGBE_DOWN, &adapter->state)) | 1062 | if (!test_bit(__IXGBE_DOWN, &adapter->state)) |
@@ -1105,7 +1105,7 @@ static int ixgbe_clean_rxonly_many(struct napi_struct *napi, int budget) | |||
1105 | rx_ring = &(adapter->rx_ring[r_idx]); | 1105 | rx_ring = &(adapter->rx_ring[r_idx]); |
1106 | /* If all Rx work done, exit the polling mode */ | 1106 | /* If all Rx work done, exit the polling mode */ |
1107 | if (work_done < budget) { | 1107 | if (work_done < budget) { |
1108 | netif_rx_complete(napi); | 1108 | napi_complete(napi); |
1109 | if (adapter->itr_setting & 3) | 1109 | if (adapter->itr_setting & 3) |
1110 | ixgbe_set_itr_msix(q_vector); | 1110 | ixgbe_set_itr_msix(q_vector); |
1111 | if (!test_bit(__IXGBE_DOWN, &adapter->state)) | 1111 | if (!test_bit(__IXGBE_DOWN, &adapter->state)) |
@@ -1381,13 +1381,13 @@ static irqreturn_t ixgbe_intr(int irq, void *data) | |||
1381 | 1381 | ||
1382 | ixgbe_check_fan_failure(adapter, eicr); | 1382 | ixgbe_check_fan_failure(adapter, eicr); |
1383 | 1383 | ||
1384 | if (netif_rx_schedule_prep(&adapter->q_vector[0].napi)) { | 1384 | if (napi_schedule_prep(&adapter->q_vector[0].napi)) { |
1385 | adapter->tx_ring[0].total_packets = 0; | 1385 | adapter->tx_ring[0].total_packets = 0; |
1386 | adapter->tx_ring[0].total_bytes = 0; | 1386 | adapter->tx_ring[0].total_bytes = 0; |
1387 | adapter->rx_ring[0].total_packets = 0; | 1387 | adapter->rx_ring[0].total_packets = 0; |
1388 | adapter->rx_ring[0].total_bytes = 0; | 1388 | adapter->rx_ring[0].total_bytes = 0; |
1389 | /* would disable interrupts here but EIAM disabled it */ | 1389 | /* would disable interrupts here but EIAM disabled it */ |
1390 | __netif_rx_schedule(&adapter->q_vector[0].napi); | 1390 | __napi_schedule(&adapter->q_vector[0].napi); |
1391 | } | 1391 | } |
1392 | 1392 | ||
1393 | return IRQ_HANDLED; | 1393 | return IRQ_HANDLED; |
@@ -2317,7 +2317,7 @@ static int ixgbe_poll(struct napi_struct *napi, int budget) | |||
2317 | 2317 | ||
2318 | /* If budget not fully consumed, exit the polling mode */ | 2318 | /* If budget not fully consumed, exit the polling mode */ |
2319 | if (work_done < budget) { | 2319 | if (work_done < budget) { |
2320 | netif_rx_complete(napi); | 2320 | napi_complete(napi); |
2321 | if (adapter->itr_setting & 3) | 2321 | if (adapter->itr_setting & 3) |
2322 | ixgbe_set_itr(adapter); | 2322 | ixgbe_set_itr(adapter); |
2323 | if (!test_bit(__IXGBE_DOWN, &adapter->state)) | 2323 | if (!test_bit(__IXGBE_DOWN, &adapter->state)) |