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

Commit 53c52513 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

parents 400e0208 5edd0b94

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;