ice: Use the right function to enable/disable VSI

The ice_ena/dis_vsi should have a single differentiating
factor to determine if the netdev_ops call is used or a
direct call to ice_vsi_open/close.  This is if the netif is
running or not.  If netif is running, use ndo_open/ndo_close.
Else, use ice_vsi_open/ice_vsi_close.

Signed-off-by: Dave Ertman <david.m.ertman@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 948c97defeba62ce5fb09a2b53161c18fce1bb47..02cfd874f67474695636b953cf33ea35367e60c5 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -3214,13 +3214,14 @@ static void ice_dis_vsi(struct ice_vsi *vsi)
 
        set_bit(__ICE_NEEDS_RESTART, vsi->state);
 
-       if (vsi->netdev && netif_running(vsi->netdev) &&
-           vsi->type == ICE_VSI_PF) {
-               rtnl_lock();
-               vsi->netdev->netdev_ops->ndo_stop(vsi->netdev);
-               rtnl_unlock();
-       } else {
-               ice_vsi_close(vsi);
+       if (vsi->type == ICE_VSI_PF && vsi->netdev) {
+               if (netif_running(vsi->netdev)) {
+                       rtnl_lock();
+                       vsi->netdev->netdev_ops->ndo_stop(vsi->netdev);
+                       rtnl_unlock();
+               } else {
+                       ice_vsi_close(vsi);
+               }
        }
 }
 
@@ -3232,12 +3233,16 @@ static int ice_ena_vsi(struct ice_vsi *vsi)
 {
        int err = 0;
 
-       if (test_and_clear_bit(__ICE_NEEDS_RESTART, vsi->state))
-               if (vsi->netdev && netif_running(vsi->netdev)) {
+       if (test_and_clear_bit(__ICE_NEEDS_RESTART, vsi->state) &&
+           vsi->netdev) {
+               if (netif_running(vsi->netdev)) {
                        rtnl_lock();
                        err = vsi->netdev->netdev_ops->ndo_open(vsi->netdev);
                        rtnl_unlock();
+               } else {
+                       err = ice_vsi_open(vsi);
                }
+       }
 
        return err;
 }