Commit 316a28da authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Tony Nguyen
Browse files

ice: cleanup inconsistent code 



It was found while doing further testing of the previous commit
fbf32a9bab91 ("ice: field get conversion") that one of the FIELD_GET
conversions should really be a FIELD_PREP. The previous code was styled
as a match to the FIELD_GET conversion, which always worked because the
shift value was 0.  The code makes way more sense as a FIELD_PREP and
was in fact the only FIELD_GET with two constant arguments in this
series.

Didn't squash this patch to make it easier to call out the
(non-impactful) bug.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 5a259f8e

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

+2 −2
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ static void ice_set_dflt_vsi_ctx(struct ice_hw *hw, struct ice_vsi_ctx *ctxt) 
	/* Traffic from VSI can be sent to LAN */

	ctxt->info.sw_flags2 = ICE_AQ_VSI_SW_FLAG_LAN_ENA;

	/* allow all untagged/tagged packets by default on Tx */

	ctxt->info.inner_vlan_flags = FIELD_GET(ICE_AQ_VSI_INNER_VLAN_TX_MODE_M,

	ctxt->info.inner_vlan_flags = FIELD_PREP(ICE_AQ_VSI_INNER_VLAN_TX_MODE_M,

						 ICE_AQ_VSI_INNER_VLAN_TX_MODE_ALL);

	/* SVM - by default bits 3 and 4 in inner_vlan_flags are 0's which

	 * results in legacy behavior (show VLAN, DEI, and UP) in descriptor.

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

+1 −1

File changed.

Contains only whitespace changes.