1 files changed, 16 insertions, 15 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 7dda8b22980d..2210ab247711 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -3518,6 +3518,19 @@ static void i40e_napi_disable_all(struct i40e_vsi *vsi)
 }
 
 /**
+ * i40e_vsi_close - Shut down a VSI
+ * @vsi: the vsi to be quelled
+ **/
+static void i40e_vsi_close(struct i40e_vsi *vsi)
+{
+        if (!test_and_set_bit(__I40E_DOWN, &vsi->state))
+                i40e_down(vsi);
+        i40e_vsi_free_irq(vsi);
+        i40e_vsi_free_tx_resources(vsi);
+        i40e_vsi_free_rx_resources(vsi);
+}
+
+/**
  * i40e_quiesce_vsi - Pause a given VSI
  * @vsi: the VSI being paused
  **/
@@ -3530,8 +3543,7 @@ static void i40e_quiesce_vsi(struct i40e_vsi *vsi)
         if (vsi->netdev && netif_running(vsi->netdev)) {
                 vsi->netdev->netdev_ops->ndo_stop(vsi->netdev);
         } else {
-                set_bit(__I40E_DOWN, &vsi->state);
-                i40e_down(vsi);
+                i40e_vsi_close(vsi);
         }
 }
 
@@ -4383,14 +4395,7 @@ static int i40e_close(struct net_device *netdev)
         struct i40e_netdev_priv *np = netdev_priv(netdev);
         struct i40e_vsi *vsi = np->vsi;
 
-        if (test_and_set_bit(__I40E_DOWN, &vsi->state))
-                return 0;
-
-        i40e_down(vsi);
-        i40e_vsi_free_irq(vsi);
-
-        i40e_vsi_free_tx_resources(vsi);
-        i40e_vsi_free_rx_resources(vsi);
+        i40e_vsi_close(vsi);
 
         return 0;
 }
@@ -7075,11 +7080,7 @@ int i40e_vsi_release(struct i40e_vsi *vsi)
                                 unregister_netdev(vsi->netdev);
                         }
                 } else {
-                        if (!test_and_set_bit(__I40E_DOWN, &vsi->state))
-                                i40e_down(vsi);
-                        i40e_vsi_free_irq(vsi);
-                        i40e_vsi_free_tx_resources(vsi);
-                        i40e_vsi_free_rx_resources(vsi);
+                        i40e_vsi_close(vsi);
                 }
                 i40e_vsi_disable_irq(vsi);
         }