summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
diff options
context:
space:
mode:
authorMeenakshi Venkataraman2012-02-08 21:04:41 +0100
committerWey-Yi Guy2012-02-17 19:58:39 +0100
commit758f555f5e69bb44fc85edb90b3d15e68a29bc0c (patch)
tree2c1028372ffeec02cbd2a2341ec4b02461d6d6b9 /drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
parentiwlwifi: remove un-necessary return (diff)
downloadkernel-qcow2-linux-758f555f5e69bb44fc85edb90b3d15e68a29bc0c.tar.gz
kernel-qcow2-linux-758f555f5e69bb44fc85edb90b3d15e68a29bc0c.tar.xz
kernel-qcow2-linux-758f555f5e69bb44fc85edb90b3d15e68a29bc0c.zip
iwlwifi: enable receiving beacons when not associated
If the firmware implements beacon filtering, beacons are filtered when not associated. This causes association failures on channels marked passive. Enabling this flag indicates to the firmware to allow the beacons to pass through when not associated only. Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@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.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 8ca9570ec365..35dd7e364b46 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -900,6 +900,22 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
}
}
+ /*
+ * If the ucode decides to do beacon filtering before
+ * association, it will lose beacons that are needed
+ * before sending frames out on passive channels. This
+ * causes association failures on those channels. Enable
+ * receiving beacons in such cases.
+ */
+
+ if (vif->type == NL80211_IFTYPE_STATION) {
+ if (!bss_conf->assoc)
+ ctx->staging.filter_flags |= RXON_FILTER_BCON_AWARE_MSK;
+ else
+ ctx->staging.filter_flags &=
+ ~RXON_FILTER_BCON_AWARE_MSK;
+ }
+
if (force || memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging)))
iwlagn_commit_rxon(priv, ctx);