| From 242e34500a32631f85c2b4eb6cb42a368a39e54f Mon Sep 17 00:00:00 2001 |
| From: Jesse Brandeburg <jesse.brandeburg@intel.com> |
| Date: Tue, 10 Oct 2023 13:30:59 -0700 |
| Subject: ice: fix over-shifted variable |
| |
| From: Jesse Brandeburg <jesse.brandeburg@intel.com> |
| |
| 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: d76a60ba7afb ("ice: Add support for VLANs and offloads") |
| Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> |
| CC: stable@vger.kernel.org |
| Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> |
| Reviewed-by: Simon Horman <horms@kernel.org> |
| Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel) |
| Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> |
| Link: https://lore.kernel.org/r/20231010203101.406248-1-jacob.e.keller@intel.com |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/intel/ice/ice_lib.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/drivers/net/ethernet/intel/ice/ice_lib.c |
| +++ b/drivers/net/ethernet/intel/ice/ice_lib.c |
| @@ -1201,8 +1201,7 @@ static void ice_set_rss_vsi_ctx(struct i |
| |
| 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); |
| } |
| |
| static void |
