Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 124cd547 authored by Dave Ertman's avatar Dave Ertman Committed by Jeff Kirsher
Browse files

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: default avatarDave Ertman <david.m.ertman@intel.com>
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent d2b464a7

drivers/net/ethernet/intel/ice/ice_main.c

+14 −9
Original line number Diff line number Diff line
@@ -3214,8 +3214,8 @@ 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) {

	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();
@@ -3223,6 +3223,7 @@ static void ice_dis_vsi(struct ice_vsi *vsi) 
			ice_vsi_close(vsi);

		}

	}

}



/**

 * ice_ena_vsi - resume a VSI
@@ -3232,11 +3233,15 @@ 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;