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: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_dcb.c b/drivers/net/ethernet/intel/ice/ice_dcb.c
index 7f3e00c187b4d7af5042a209cb1e964ff24816ad..74418c445cc435a99b425b6375f043cc1edde1d8 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_dcb.c
+++ b/drivers/net/ethernet/intel/ice/ice_dcb.c
@@ -967,7 +967,7 @@ void ice_get_dcb_cfg_from_mib_change(struct ice_port_info *pi,
 
        mib = (struct ice_aqc_lldp_get_mib *)&event->desc.params.raw;
 
-       change_type = FIELD_GET(ICE_AQ_LLDP_MIB_TYPE_M,  mib->type);
+       change_type = FIELD_GET(ICE_AQ_LLDP_MIB_TYPE_M, mib->type);
        if (change_type == ICE_AQ_LLDP_MIB_REMOTE)
                dcbx_cfg = &pi->qos_cfg.remote_dcbx_cfg;
 

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 673830b77bfd2ea5c0638de018f46a3ce19af60d..9b4fe8ce3d3b2b845aacd4e5b2adfb4613df09d7 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -974,8 +974,8 @@ 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,
-                                               ICE_AQ_VSI_INNER_VLAN_TX_MODE_ALL);
+       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.
         *