summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
diff options
context:
space:
mode:
authorJohannes Berg2011-06-22 15:34:09 +0200
committerWey-Yi Guy2011-06-24 20:54:51 +0200
commitf775aa06d2de583bd291d4bf5814784c9ff7b9cc (patch)
tree4a2ed6875f13f63885cc298949558596ebaa11f1 /drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
parentiwlagn: fill beacon TX rate properly (diff)
downloadkernel-qcow2-linux-f775aa06d2de583bd291d4bf5814784c9ff7b9cc.tar.gz
kernel-qcow2-linux-f775aa06d2de583bd291d4bf5814784c9ff7b9cc.tar.xz
kernel-qcow2-linux-f775aa06d2de583bd291d4bf5814784c9ff7b9cc.zip
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 a7c66c4e5f2a..8fa43d427811 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,
* keys, so we have to restore those afterwards.
*/
iwl_clear_ucode_stations(priv, ctx);
+ /* update -- might need P2P now */
+ iwl_update_bcast_station(priv, ctx);
iwl_restore_stations(priv, ctx);
ret = iwl_restore_default_wep_keys(priv, ctx);
if (ret) {