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

Commit 5edd0b94 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: fix the basic CCK rates calculation 



Fix a copy paste error in iwl_calc_basic_rates which leads
to a wrong calculation of CCK basic rates.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e1b69fdf

drivers/net/wireless/iwlwifi/dvm/rxon.c

+6 −6
Original line number Diff line number Diff line
@@ -1012,12 +1012,12 @@ static void iwl_calc_basic_rates(struct iwl_priv *priv, 
	 * As a consequence, it's not as complicated as it sounds, just add

	 * any lower rates to the ACK rate bitmap.

	 */

	if (IWL_RATE_11M_INDEX < lowest_present_ofdm)

		ofdm |= IWL_RATE_11M_MASK >> IWL_FIRST_CCK_RATE;

	if (IWL_RATE_5M_INDEX < lowest_present_ofdm)

		ofdm |= IWL_RATE_5M_MASK >> IWL_FIRST_CCK_RATE;

	if (IWL_RATE_2M_INDEX < lowest_present_ofdm)

		ofdm |= IWL_RATE_2M_MASK >> IWL_FIRST_CCK_RATE;

	if (IWL_RATE_11M_INDEX < lowest_present_cck)

		cck |= IWL_RATE_11M_MASK >> IWL_FIRST_CCK_RATE;

	if (IWL_RATE_5M_INDEX < lowest_present_cck)

		cck |= IWL_RATE_5M_MASK >> IWL_FIRST_CCK_RATE;

	if (IWL_RATE_2M_INDEX < lowest_present_cck)

		cck |= IWL_RATE_2M_MASK >> IWL_FIRST_CCK_RATE;

	/* 1M already there or needed so always add */

	cck |= IWL_RATE_1M_MASK >> IWL_FIRST_CCK_RATE;