1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 940d9244df62..a2cba53c31be 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -1620,6 +1620,7 @@ static void ixgbevf_up_complete(struct ixgbevf_adapter *adapter)
 
         spin_unlock_bh(&adapter->mbx_lock);
 
+        smp_mb__before_clear_bit();
         clear_bit(__IXGBEVF_DOWN, &adapter->state);
         ixgbevf_napi_enable_all(adapter);
 
@@ -1744,7 +1745,8 @@ void ixgbevf_down(struct ixgbevf_adapter *adapter)
         int i;
 
         /* signal that we are down to the interrupt handler */
-        set_bit(__IXGBEVF_DOWN, &adapter->state);
+        if (test_and_set_bit(__IXGBEVF_DOWN, &adapter->state))
+                return; /* do nothing if already down */
 
         /* disable all enabled rx queues */
         for (i = 0; i < adapter->num_rx_queues; i++)