Commit 83b49e7f authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Tony Nguyen
Browse files

ice: check if VF exists before mode check 



Setting trust on VF should return EINVAL when there is no VF. Move
checking for switchdev mode after checking if VF exists.

Fixes: c54d209c ("ice: Wait for VF to be reset/ready before configuration")
Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@intel.com>
Signed-off-by: default avatarKalyan Kodamagula <kalyan.kodamagula@intel.com>
Tested-by: default avatarSujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 387d42ae

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

+4 −4
Original line number Diff line number Diff line
@@ -1341,15 +1341,15 @@ int ice_set_vf_trust(struct net_device *netdev, int vf_id, bool trusted) 
	struct ice_vf *vf;

	int ret;



	vf = ice_get_vf_by_id(pf, vf_id);

	if (!vf)

		return -EINVAL;



	if (ice_is_eswitch_mode_switchdev(pf)) {

		dev_info(ice_pf_to_dev(pf), "Trusted VF is forbidden in switchdev mode\n");

		return -EOPNOTSUPP;

	}



	vf = ice_get_vf_by_id(pf, vf_id);

	if (!vf)

		return -EINVAL;



	ret = ice_check_vf_ready_for_cfg(vf);

	if (ret)

		goto out_put_vf;