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

Commit 8ec82cfe authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Greg Kroah-Hartman
Browse files

ice: add missing checks for PF vsi type 



[ Upstream commit 6a8d013e904ad9a66706fcc926ec9993bed7d190 ]

There were a few places we had missed checking the VSI type to make sure
it was definitely a PF VSI, before calling setup functions intended only
for the PF VSI.

This doesn't fix any explicit bugs but cleans up the code in a few
places and removes one explicit != vsi->type check that can be
superseded by this code (it's a super set)

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f81c0d48

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

+8 −9
Original line number Diff line number Diff line
@@ -3492,16 +3492,13 @@ int ice_vsi_cfg(struct ice_vsi *vsi) 
{

	int err;



	if (vsi->netdev) {

	if (vsi->netdev && vsi->type == ICE_VSI_PF) {

		ice_set_rx_mode(vsi->netdev);



		if (vsi->type != ICE_VSI_LB) {

		err = ice_vsi_vlan_setup(vsi);



		if (err)

			return err;

	}

	}

	ice_vsi_cfg_dcb_rings(vsi);



	err = ice_vsi_cfg_lan_txqs(vsi);
@@ -3557,7 +3554,7 @@ static int ice_up_complete(struct ice_vsi *vsi) 


	if (vsi->port_info &&

	    (vsi->port_info->phy.link_info.link_info & ICE_AQ_LINK_UP) &&

	    vsi->netdev) {

	    vsi->netdev && vsi->type == ICE_VSI_PF) {

		ice_print_link_msg(vsi, true);

		netif_tx_start_all_queues(vsi->netdev);

		netif_carrier_on(vsi->netdev);
@@ -3567,6 +3564,8 @@ static int ice_up_complete(struct ice_vsi *vsi) 
	 * set the baseline so counters are ready when interface is up

	 */

	ice_update_eth_stats(vsi);



	if (vsi->type == ICE_VSI_PF)

		ice_service_task_schedule(pf);



	return 0;