diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-08 10:59:33 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 18:58:53 -0400 |
| commit | 7a5158ef8da70fdedeb0530faaa8128aa645be3c (patch) | |
| tree | 6db285b5fc4971c5e15168fc0fb7cf442b89f168 /net/mac80211/main.c | |
| parent | e87a2feea75e3cba7af43ed9317b56b282d87742 (diff) | |
| download | linux-3.10-7a5158ef8da70fdedeb0530faaa8128aa645be3c.tar.gz linux-3.10-7a5158ef8da70fdedeb0530faaa8128aa645be3c.tar.bz2 linux-3.10-7a5158ef8da70fdedeb0530faaa8128aa645be3c.zip | |
mac80211: fix short slot handling
This patch makes mac80211 handle short slot requests from the AP
properly. Also warn about uses of IEEE80211_CONF_SHORT_SLOT_TIME
and optimise out the code since it cannot ever be hit anyway.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index d1c4e86b215..c427954fe8e 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -346,9 +346,12 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata, u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata) { - sdata->bss_conf.use_cts_prot = 0; - sdata->bss_conf.use_short_preamble = 0; - return BSS_CHANGED_ERP_CTS_PROT | BSS_CHANGED_ERP_PREAMBLE; + sdata->bss_conf.use_cts_prot = false; + sdata->bss_conf.use_short_preamble = false; + sdata->bss_conf.use_short_slot = false; + return BSS_CHANGED_ERP_CTS_PROT | + BSS_CHANGED_ERP_PREAMBLE | + BSS_CHANGED_ERP_SLOT; } void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw, |