Commit 1261691d authored by Jacob Keller's avatar Jacob Keller Committed by Tony Nguyen
Browse files

ice: use ice_is_vf_trusted helper function 



The ice_vc_cfg_promiscuous_mode_msg function directly checks
ICE_VIRTCHNL_VF_CAP_PRIVILEGE, instead of using the existing helper
function ice_is_vf_trusted. Switch this to use the helper function so
that all trusted checks are consistent. This aids in any potential
future refactor by ensuring consistent code.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarKonrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 2b369448

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

+10 −10
Original line number Diff line number Diff line
@@ -3148,6 +3148,15 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena) 
	return ret;

}



/**

 * ice_is_vf_trusted

 * @vf: pointer to the VF info

 */

static bool ice_is_vf_trusted(struct ice_vf *vf)

{

	return test_bit(ICE_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps);

}



/**

 * ice_is_any_vf_in_promisc - check if any VF(s) are in promiscuous mode

 * @pf: PF structure for accessing VF(s)
@@ -3212,7 +3221,7 @@ static int ice_vc_cfg_promiscuous_mode_msg(struct ice_vf *vf, u8 *msg) 
	}



	dev = ice_pf_to_dev(pf);

	if (!test_bit(ICE_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps)) {

	if (!ice_is_vf_trusted(vf)) {

		dev_err(dev, "Unprivileged VF %d is attempting to configure promiscuous mode\n",

			vf->vf_id);

		/* Leave v_ret alone, lie to the VF on purpose. */
@@ -3862,15 +3871,6 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg) 
				     NULL, 0);

}



/**

 * ice_is_vf_trusted

 * @vf: pointer to the VF info

 */

static bool ice_is_vf_trusted(struct ice_vf *vf)

{

	return test_bit(ICE_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps);

}



/**

 * ice_can_vf_change_mac

 * @vf: pointer to the VF info