From: Helmut Schaa Date: Wed, 2 Mar 2011 09:46:46 +0000 (+0100) Subject: wl12xx: Correctly set up protection if non-GF STAs are present X-Git-Tag: v2.6.39-rc1~468^2~88^2^2~47^2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=95a776107a131823c87147dff083696d8814c1b3;p=~shefty%2Frdma-dev.git 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 Signed-off-by: Luciano Coelho --- diff --git a/drivers/net/wireless/wl12xx/acx.c b/drivers/net/wireless/wl12xx/acx.c index 3badc6bb786..a3db755ceed 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;