diff options
author | Helmut Schaa <helmut.schaa@googlemail.com> | 2011-03-02 04:46:46 -0500 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2011-03-03 09:20:34 -0500 |
commit | 95a776107a131823c87147dff083696d8814c1b3 (patch) | |
tree | 82a8cc9fd73c5d2b968fa9b06430f04256520da4 | |
parent | 24225b37bd78d3e2edaa1a39316c54786adaa465 (diff) |
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>
-rw-r--r-- | drivers/net/wireless/wl12xx/acx.c | 3 |
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, | |||
1361 | acx->ht_protection = | 1361 | acx->ht_protection = |
1362 | (u8)(ht_operation_mode & IEEE80211_HT_OP_MODE_PROTECTION); | 1362 | (u8)(ht_operation_mode & IEEE80211_HT_OP_MODE_PROTECTION); |
1363 | acx->rifs_mode = 0; | 1363 | acx->rifs_mode = 0; |
1364 | acx->gf_protection = 0; | 1364 | acx->gf_protection = |
1365 | !!(ht_operation_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT); | ||
1365 | acx->ht_tx_burst_limit = 0; | 1366 | acx->ht_tx_burst_limit = 0; |
1366 | acx->dual_cts_protection = 0; | 1367 | acx->dual_cts_protection = 0; |
1367 | 1368 | ||