diff options
Diffstat (limited to 'drivers/net/ixgb/ixgb_main.c')
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index eee28d395682..e2ef16b29700 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
@@ -1721,14 +1721,14 @@ ixgb_intr(int irq, void *data) | |||
1721 | if (!test_bit(__IXGB_DOWN, &adapter->flags)) | 1721 | if (!test_bit(__IXGB_DOWN, &adapter->flags)) |
1722 | mod_timer(&adapter->watchdog_timer, jiffies); | 1722 | mod_timer(&adapter->watchdog_timer, jiffies); |
1723 | 1723 | ||
1724 | if (netif_rx_schedule_prep(&adapter->napi)) { | 1724 | if (napi_schedule_prep(&adapter->napi)) { |
1725 | 1725 | ||
1726 | /* Disable interrupts and register for poll. The flush | 1726 | /* Disable interrupts and register for poll. The flush |
1727 | of the posted write is intentionally left out. | 1727 | of the posted write is intentionally left out. |
1728 | */ | 1728 | */ |
1729 | 1729 | ||
1730 | IXGB_WRITE_REG(&adapter->hw, IMC, ~0); | 1730 | IXGB_WRITE_REG(&adapter->hw, IMC, ~0); |
1731 | __netif_rx_schedule(&adapter->napi); | 1731 | __napi_schedule(&adapter->napi); |
1732 | } | 1732 | } |
1733 | return IRQ_HANDLED; | 1733 | return IRQ_HANDLED; |
1734 | } | 1734 | } |
@@ -1749,7 +1749,7 @@ ixgb_clean(struct napi_struct *napi, int budget) | |||
1749 | 1749 | ||
1750 | /* If budget not fully consumed, exit the polling mode */ | 1750 | /* If budget not fully consumed, exit the polling mode */ |
1751 | if (work_done < budget) { | 1751 | if (work_done < budget) { |
1752 | netif_rx_complete(napi); | 1752 | napi_complete(napi); |
1753 | if (!test_bit(__IXGB_DOWN, &adapter->flags)) | 1753 | if (!test_bit(__IXGB_DOWN, &adapter->flags)) |
1754 | ixgb_irq_enable(adapter); | 1754 | ixgb_irq_enable(adapter); |
1755 | } | 1755 | } |