i40evf: resequence close operations

Call the netdev carrier off and TX disable functions first, before other
shutdown operations. This stops the stack from hitting us with
transmits while we're shutting down. Additionally, disable NAPI before
disabling interrupts, or the interrupt might get re-enabled
inappropriately. Finally, remove the call to netif_tx_stop_all_queues,
as it is redundant - the call to netif_tx_disable already did the same
thing.

Change-ID: I8b2dd25231b82817746cc256234a5eeeb4abaccc
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Tested-by: Jim Young <james.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index da901f4b9c18c16fd613fec4ae0c13343e065e5d..b08efafee1aee4c763fa111289ce4fe1736b5039 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -971,8 +971,10 @@ void i40evf_down(struct i40evf_adapter *adapter)
                                &adapter->crit_section))
                usleep_range(500, 1000);
 
-       i40evf_irq_disable(adapter);
+       netif_carrier_off(netdev);
+       netif_tx_disable(netdev);
        i40evf_napi_disable_all(adapter);
+       i40evf_irq_disable(adapter);
 
        /* remove all MAC filters */
        list_for_each_entry(f, &adapter->mac_filter_list, list) {
@@ -995,13 +997,7 @@ void i40evf_down(struct i40evf_adapter *adapter)
                adapter->aq_required |= I40EVF_FLAG_AQ_DEL_VLAN_FILTER;
                adapter->aq_required |= I40EVF_FLAG_AQ_DISABLE_QUEUES;
        }
-       netif_tx_disable(netdev);
 
-       netif_tx_stop_all_queues(netdev);
-
-       msleep(20);
-
-       netif_carrier_off(netdev);
        clear_bit(__I40EVF_IN_CRITICAL_TASK, &adapter->crit_section);
 }