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

Commit 263b5f5a authored by Ron Rindjunsky's avatar Ron Rindjunsky Committed by John W. Linville
Browse files

iwlwifi: use ieee80211_conf to examine rate capabilities 



This patch switches the use of internal iwlwifi structure with
ieee80211_conf in order to examine ht rate capabilities.

Signed-off-by: default avatarRon Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e26e47d9

drivers/net/wireless/iwlwifi/iwl-4965-rs.c

+6 −12
Original line number Original line Diff line number Diff line
@@ -2245,25 +2245,19 @@ static void rs_rate_init(void *priv_rate, void *priv_sta, 
	 * active_siso_rate mask includes 9 MBits (bit 5), and CCK (bits 0-3),

	 * active_siso_rate mask includes 9 MBits (bit 5), and CCK (bits 0-3),

	 * supp_rates[] does not; shift to convert format, force 9 MBits off.

	 * supp_rates[] does not; shift to convert format, force 9 MBits off.

	 */

	 */

	lq_sta->active_siso_rate =

	lq_sta->active_siso_rate = conf->ht_conf.supp_mcs_set[0] << 1;

		priv->current_ht_config.supp_mcs_set[0] << 1;

	lq_sta->active_siso_rate |= conf->ht_conf.supp_mcs_set[0] & 0x1;

	lq_sta->active_siso_rate |=

		priv->current_ht_config.supp_mcs_set[0] & 0x1;

	lq_sta->active_siso_rate &= ~((u16)0x2);

	lq_sta->active_siso_rate &= ~((u16)0x2);

	lq_sta->active_siso_rate <<= IWL_FIRST_OFDM_RATE;

	lq_sta->active_siso_rate <<= IWL_FIRST_OFDM_RATE;





	/* Same here */

	/* Same here */

	lq_sta->active_mimo2_rate =

	lq_sta->active_mimo2_rate = conf->ht_conf.supp_mcs_set[1] << 1;

		priv->current_ht_config.supp_mcs_set[1] << 1;

	lq_sta->active_mimo2_rate |= conf->ht_conf.supp_mcs_set[1] & 0x1;

	lq_sta->active_mimo2_rate |=

		priv->current_ht_config.supp_mcs_set[1] & 0x1;

	lq_sta->active_mimo2_rate &= ~((u16)0x2);

	lq_sta->active_mimo2_rate &= ~((u16)0x2);

	lq_sta->active_mimo2_rate <<= IWL_FIRST_OFDM_RATE;

	lq_sta->active_mimo2_rate <<= IWL_FIRST_OFDM_RATE;





	lq_sta->active_mimo3_rate =

	lq_sta->active_mimo3_rate = conf->ht_conf.supp_mcs_set[2] << 1;

		priv->current_ht_config.supp_mcs_set[2] << 1;

	lq_sta->active_mimo3_rate |= conf->ht_conf.supp_mcs_set[2] & 0x1;

	lq_sta->active_mimo3_rate |=

		priv->current_ht_config.supp_mcs_set[2] & 0x1;

	lq_sta->active_mimo3_rate &= ~((u16)0x2);

	lq_sta->active_mimo3_rate &= ~((u16)0x2);

	lq_sta->active_mimo3_rate <<= IWL_FIRST_OFDM_RATE;

	lq_sta->active_mimo3_rate <<= IWL_FIRST_OFDM_RATE;