1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index d2fb88d5cda2..4f63839051b0 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -296,6 +296,11 @@ ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog)
 {
         struct net_device *netdev = adapter->netdev;
 
+#ifdef CONFIG_IXGB_NAPI
+        napi_disable(&adapter->napi);
+        atomic_set(&adapter->irq_sem, 0);
+#endif
+
         ixgb_irq_disable(adapter);
         free_irq(adapter->pdev->irq, netdev);
 
@@ -304,9 +309,7 @@ ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog)
 
         if(kill_watchdog)
                 del_timer_sync(&adapter->watchdog_timer);
-#ifdef CONFIG_IXGB_NAPI
-        napi_disable(&adapter->napi);
-#endif
+
         adapter->link_speed = 0;
         adapter->link_duplex = 0;
         netif_carrier_off(netdev);