diff options
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 26474c92193f..ffe466e0afb9 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -3687,12 +3687,12 @@ static irqreturn_t e1000_intr_msi(int irq, void *data) | |||
3687 | mod_timer(&adapter->watchdog_timer, jiffies + 1); | 3687 | mod_timer(&adapter->watchdog_timer, jiffies + 1); |
3688 | } | 3688 | } |
3689 | 3689 | ||
3690 | if (likely(netif_rx_schedule_prep(&adapter->napi))) { | 3690 | if (likely(napi_schedule_prep(&adapter->napi))) { |
3691 | adapter->total_tx_bytes = 0; | 3691 | adapter->total_tx_bytes = 0; |
3692 | adapter->total_tx_packets = 0; | 3692 | adapter->total_tx_packets = 0; |
3693 | adapter->total_rx_bytes = 0; | 3693 | adapter->total_rx_bytes = 0; |
3694 | adapter->total_rx_packets = 0; | 3694 | adapter->total_rx_packets = 0; |
3695 | __netif_rx_schedule(&adapter->napi); | 3695 | __napi_schedule(&adapter->napi); |
3696 | } else | 3696 | } else |
3697 | e1000_irq_enable(adapter); | 3697 | e1000_irq_enable(adapter); |
3698 | 3698 | ||
@@ -3747,12 +3747,12 @@ static irqreturn_t e1000_intr(int irq, void *data) | |||
3747 | ew32(IMC, ~0); | 3747 | ew32(IMC, ~0); |
3748 | E1000_WRITE_FLUSH(); | 3748 | E1000_WRITE_FLUSH(); |
3749 | } | 3749 | } |
3750 | if (likely(netif_rx_schedule_prep(&adapter->napi))) { | 3750 | if (likely(napi_schedule_prep(&adapter->napi))) { |
3751 | adapter->total_tx_bytes = 0; | 3751 | adapter->total_tx_bytes = 0; |
3752 | adapter->total_tx_packets = 0; | 3752 | adapter->total_tx_packets = 0; |
3753 | adapter->total_rx_bytes = 0; | 3753 | adapter->total_rx_bytes = 0; |
3754 | adapter->total_rx_packets = 0; | 3754 | adapter->total_rx_packets = 0; |
3755 | __netif_rx_schedule(&adapter->napi); | 3755 | __napi_schedule(&adapter->napi); |
3756 | } else | 3756 | } else |
3757 | /* this really should not happen! if it does it is basically a | 3757 | /* this really should not happen! if it does it is basically a |
3758 | * bug, but not a hard error, so enable ints and continue */ | 3758 | * bug, but not a hard error, so enable ints and continue */ |
@@ -3793,7 +3793,7 @@ static int e1000_clean(struct napi_struct *napi, int budget) | |||
3793 | if (work_done < budget) { | 3793 | if (work_done < budget) { |
3794 | if (likely(adapter->itr_setting & 3)) | 3794 | if (likely(adapter->itr_setting & 3)) |
3795 | e1000_set_itr(adapter); | 3795 | e1000_set_itr(adapter); |
3796 | netif_rx_complete(napi); | 3796 | napi_complete(napi); |
3797 | e1000_irq_enable(adapter); | 3797 | e1000_irq_enable(adapter); |
3798 | } | 3798 | } |
3799 | 3799 | ||