summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHelmut Schaa <helmut.schaa@googlemail.com>2011-03-02 10:46:46 +0100
committerLuciano Coelho <coelho@ti.com>2011-03-03 16:20:34 +0200
commit95a776107a131823c87147dff083696d8814c1b3 (patch)
tree82a8cc9fd73c5d2b968fa9b06430f04256520da4 /drivers
parent24225b37bd78d3e2edaa1a39316c54786adaa465 (diff)
downloadblackbird-op-linux-95a776107a131823c87147dff083696d8814c1b3.tar.gz
blackbird-op-linux-95a776107a131823c87147dff083696d8814c1b3.zip
wl12xx: Correctly set up protection if non-GF STAs are present
Set the gf_protection bit when calling ACX_HT_BSS_OPERATION according to the GF bit passed by mac80211 in ht_operation_mode. [Added a proper commit message -- Luca] Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/wl12xx/acx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/acx.c b/drivers/net/wireless/wl12xx/acx.c
index 3badc6bb7866..a3db755ceeda 100644
--- a/drivers/net/wireless/wl12xx/acx.c
+++ b/drivers/net/wireless/wl12xx/acx.c
@@ -1361,7 +1361,8 @@ int wl1271_acx_set_ht_information(struct wl1271 *wl,
acx->ht_protection =
(u8)(ht_operation_mode & IEEE80211_HT_OP_MODE_PROTECTION);
acx->rifs_mode = 0;
- acx->gf_protection = 0;
+ acx->gf_protection =
+ !!(ht_operation_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);
acx->ht_tx_burst_limit = 0;
acx->dual_cts_protection = 0;
OpenPOWER on IntegriCloud