Commit 58623c52 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Tony Nguyen
Browse files

ice: use local for consistency 



Do a minor refactor on ice_vsi_rebuild to use a local
variable to store vsi->type.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 80ad6dde

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

+7 −5
Original line number Diff line number Diff line
@@ -3014,6 +3014,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, bool init_vsi) 
	struct ice_coalesce_stored *coalesce;

	int prev_num_q_vectors = 0;

	struct ice_vf *vf = NULL;

	enum ice_vsi_type vtype;

	enum ice_status status;

	struct ice_pf *pf;

	int ret, i;
@@ -3022,7 +3023,8 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, bool init_vsi) 
		return -EINVAL;



	pf = vsi->back;

	if (vsi->type == ICE_VSI_VF)

	vtype = vsi->type;

	if (vtype == ICE_VSI_VF)

		vf = &pf->vf[vsi->vf_id];



	coalesce = kcalloc(vsi->num_q_vectors,
@@ -3040,7 +3042,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, bool init_vsi) 
	 * many interrupts each VF needs. SR-IOV MSIX resources are also

	 * cleared in the same manner.

	 */

	if (vsi->type != ICE_VSI_VF) {

	if (vtype != ICE_VSI_VF) {

		/* reclaim SW interrupts back to the common pool */

		ice_free_res(pf->irq_tracker, vsi->base_vector, vsi->idx);

		pf->num_avail_sw_msix += vsi->num_q_vectors;
@@ -3055,7 +3057,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, bool init_vsi) 
	ice_vsi_put_qs(vsi);

	ice_vsi_clear_rings(vsi);

	ice_vsi_free_arrays(vsi);

	if (vsi->type == ICE_VSI_VF)

	if (vtype == ICE_VSI_VF)

		ice_vsi_set_num_qs(vsi, vf->vf_id);

	else

		ice_vsi_set_num_qs(vsi, ICE_INVAL_VFID);
@@ -3074,7 +3076,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, bool init_vsi) 
	if (ret < 0)

		goto err_vsi;



	switch (vsi->type) {

	switch (vtype) {

	case ICE_VSI_CTRL:

	case ICE_VSI_PF:

		ret = ice_vsi_alloc_q_vectors(vsi);
@@ -3101,7 +3103,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, bool init_vsi) 
				goto err_vectors;

		}

		/* ICE_VSI_CTRL does not need RSS so skip RSS processing */

		if (vsi->type != ICE_VSI_CTRL)

		if (vtype != ICE_VSI_CTRL)

			/* Do not exit if configuring RSS had an issue, at

			 * least receive traffic on first queue. Hence no

			 * need to capture return value