aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-06-22 09:34:09 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-06-24 14:54:51 -0400
commitf775aa06d2de583bd291d4bf5814784c9ff7b9cc (patch)
tree4a2ed6875f13f63885cc298949558596ebaa11f1 /drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
parent0b5b3ff15b301338ccec77ebc051308ac614d05d (diff)
iwlagn: don't use CCK rates for P2P interfaces
P2P interfaces must not use CCK rates, only OFDM rates are allowed. To set this up, we need to set up the broadcast station to start with 6M instead of starting with 1M. Since the interface type can change, also reset the broadcast station when RXON changes. This will affect beacons as well. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rxon.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-rxon.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index a7c66c4e5f2..8fa43d42781 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -210,6 +210,8 @@ static int iwlagn_rxon_disconn(struct iwl_priv *priv,
210 * keys, so we have to restore those afterwards. 210 * keys, so we have to restore those afterwards.
211 */ 211 */
212 iwl_clear_ucode_stations(priv, ctx); 212 iwl_clear_ucode_stations(priv, ctx);
213 /* update -- might need P2P now */
214 iwl_update_bcast_station(priv, ctx);
213 iwl_restore_stations(priv, ctx); 215 iwl_restore_stations(priv, ctx);
214 ret = iwl_restore_default_wep_keys(priv, ctx); 216 ret = iwl_restore_default_wep_keys(priv, ctx);
215 if (ret) { 217 if (ret) {