Commit c213d745 authored by Johannes Berg's avatar Johannes Berg Committed by Reinette Chatre
Browse files

iwlwifi: use proper short slot/preamble settings 



The short preamble setting might change on the
fly, and then we already use the right mac80211
variable. However, in other places we don't,
which is especially wrong in the AP code since
in that case the assoc_capability is invalid.
Also, the IBSS special case is not needed since
"use_short_slot" will be properly cleared, but
the "assoc_capability" might be invalid (which
must be the reason for the special case).

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent d73e4923

drivers/net/wireless/iwlwifi/iwl-agn.c

+4 −14
Original line number Diff line number Diff line
@@ -2860,20 +2860,16 @@ void iwl_post_associate(struct iwl_priv *priv, struct ieee80211_vif *vif) 
	IWL_DEBUG_ASSOC(priv, "assoc id %d beacon interval %d\n",

			vif->bss_conf.aid, vif->bss_conf.beacon_int);



	if (vif->bss_conf.assoc_capability & WLAN_CAPABILITY_SHORT_PREAMBLE)

	if (vif->bss_conf.use_short_preamble)

		priv->staging_rxon.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;

	else

		priv->staging_rxon.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;



	if (priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK) {

		if (vif->bss_conf.assoc_capability &

					WLAN_CAPABILITY_SHORT_SLOT_TIME)

		if (vif->bss_conf.use_short_slot)

			priv->staging_rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;

		else

			priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;



		if (vif->type == NL80211_IFTYPE_ADHOC)

			priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;

	}



	iwlcore_commit_rxon(priv);
@@ -3099,8 +3095,7 @@ void iwl_config_ap(struct iwl_priv *priv, struct ieee80211_vif *vif) 


		priv->staging_rxon.assoc_id = 0;



		if (vif->bss_conf.assoc_capability &

						WLAN_CAPABILITY_SHORT_PREAMBLE)

		if (vif->bss_conf.use_short_preamble)

			priv->staging_rxon.flags |=

				RXON_FLG_SHORT_PREAMBLE_MSK;

		else
@@ -3108,17 +3103,12 @@ void iwl_config_ap(struct iwl_priv *priv, struct ieee80211_vif *vif) 
				~RXON_FLG_SHORT_PREAMBLE_MSK;



		if (priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK) {

			if (vif->bss_conf.assoc_capability &

						WLAN_CAPABILITY_SHORT_SLOT_TIME)

			if (vif->bss_conf.use_short_slot)

				priv->staging_rxon.flags |=

					RXON_FLG_SHORT_SLOT_MSK;

			else

				priv->staging_rxon.flags &=

					~RXON_FLG_SHORT_SLOT_MSK;



			if (vif->type == NL80211_IFTYPE_ADHOC)

				priv->staging_rxon.flags &=

					~RXON_FLG_SHORT_SLOT_MSK;

		}

		/* restore RXON assoc */

		priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;

drivers/net/wireless/iwlwifi/iwl-core.c

+1 −4
Original line number Diff line number Diff line
@@ -904,14 +904,11 @@ static void iwl_set_flags_for_band(struct iwl_priv *priv, 
		priv->staging_rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;

	} else {

		/* Copied from iwl_post_associate() */

		if (vif && vif->bss_conf.assoc_capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)

		if (vif && vif->bss_conf.use_short_slot)

			priv->staging_rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;

		else

			priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;



		if (vif && vif->type == NL80211_IFTYPE_ADHOC)

			priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;



		priv->staging_rxon.flags |= RXON_FLG_BAND_24G_MSK;

		priv->staging_rxon.flags |= RXON_FLG_AUTO_DETECT_MSK;

		priv->staging_rxon.flags &= ~RXON_FLG_CCK_MSK;

drivers/net/wireless/iwlwifi/iwl3945-base.c

+4 −13
Original line number Diff line number Diff line
@@ -3096,19 +3096,16 @@ void iwl3945_post_associate(struct iwl_priv *priv, struct ieee80211_vif *vif) 
	IWL_DEBUG_ASSOC(priv, "assoc id %d beacon interval %d\n",

			vif->bss_conf.aid, vif->bss_conf.beacon_int);



	if (vif->bss_conf.assoc_capability & WLAN_CAPABILITY_SHORT_PREAMBLE)

	if (vif->bss_conf.use_short_preamble)

		priv->staging_rxon.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;

	else

		priv->staging_rxon.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;



	if (priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK) {

		if (vif->bss_conf.assoc_capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)

		if (vif->bss_conf.use_short_slot)

			priv->staging_rxon.flags |= RXON_FLG_SHORT_SLOT_MSK;

		else

			priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;



		if (vif->type == NL80211_IFTYPE_ADHOC)

			priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK;

	}



	iwlcore_commit_rxon(priv);
@@ -3272,8 +3269,7 @@ void iwl3945_config_ap(struct iwl_priv *priv, struct ieee80211_vif *vif) 


		priv->staging_rxon.assoc_id = 0;



		if (vif->bss_conf.assoc_capability &

					WLAN_CAPABILITY_SHORT_PREAMBLE)

		if (vif->bss_conf.use_short_preamble)

			priv->staging_rxon.flags |=

				RXON_FLG_SHORT_PREAMBLE_MSK;

		else
@@ -3281,17 +3277,12 @@ void iwl3945_config_ap(struct iwl_priv *priv, struct ieee80211_vif *vif) 
				~RXON_FLG_SHORT_PREAMBLE_MSK;



		if (priv->staging_rxon.flags & RXON_FLG_BAND_24G_MSK) {

			if (vif->bss_conf.assoc_capability &

					WLAN_CAPABILITY_SHORT_SLOT_TIME)

			if (vif->bss_conf.use_short_slot)

				priv->staging_rxon.flags |=

					RXON_FLG_SHORT_SLOT_MSK;

			else

				priv->staging_rxon.flags &=

					~RXON_FLG_SHORT_SLOT_MSK;



			if (vif->type == NL80211_IFTYPE_ADHOC)

				priv->staging_rxon.flags &=

					~RXON_FLG_SHORT_SLOT_MSK;

		}

		/* restore RXON assoc */

		priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;

CRA Git | Maintained and supported by SUSTech CRA and CCSE