Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80ce32ab authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Greg Kroah-Hartman
Browse files

ice: fix over-shifted variable 



commit 242e34500a32631f85c2b4eb6cb42a368a39e54f upstream.

Since the introduction of the ice driver the code has been
double-shifting the RSS enabling field, because the define already has
shifts in it and can't have the regular pattern of "a << shiftval &
mask" applied.

Most places in the code got it right, but one line was still wrong. Fix
this one location for easy backports to stable. An in-progress patch
fixes the defines to "standard" and will be applied as part of the
regular -next process sometime after this one.

Fixes: d76a60ba ("ice: Add support for VLANs and offloads")
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
CC: stable@vger.kernel.org
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20231010203101.406248-1-jacob.e.keller@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec8f0d0f

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

+1 −2
Original line number Diff line number Diff line
@@ -1015,8 +1015,7 @@ static void ice_set_rss_vsi_ctx(struct ice_vsi_ctx *ctxt, struct ice_vsi *vsi) 


	ctxt->info.q_opt_rss = ((lut_type << ICE_AQ_VSI_Q_OPT_RSS_LUT_S) &

				ICE_AQ_VSI_Q_OPT_RSS_LUT_M) |

				((hash_type << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) &

				 ICE_AQ_VSI_Q_OPT_RSS_HASH_M);

				(hash_type & ICE_AQ_VSI_Q_OPT_RSS_HASH_M);

}



/**