diff options
| author | Ben Greear <greearb@candelatech.com> | 2012-12-13 01:56:20 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-03 13:01:14 +0100 |
| commit | bc0784d951470ca6597239f1bae6e59caf49fb10 (patch) | |
| tree | c87ecf36682ffff4860279b1f2ebf197ec1bf1e3 /net/mac80211/ht.c | |
| parent | Merge remote-tracking branch 'mac80211/master' into HEAD (diff) | |
| download | linux-bc0784d951470ca6597239f1bae6e59caf49fb10.tar.xz linux-bc0784d951470ca6597239f1bae6e59caf49fb10.zip | |
mac80211: Allow disabling SGI-20
This allows user-space (wpa_supplicant) to disable
short guard interval (SGI) for 20Mhz. The SGI-40
disable option is already handled.
Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ht.c')
| -rw-r--r-- | net/mac80211/ht.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index a71d891794a4..8a6d68f1f404 100644 --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c @@ -62,6 +62,9 @@ void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata, __check_htcap_disable(sdata, ht_cap, IEEE80211_HT_CAP_SUP_WIDTH_20_40); __check_htcap_disable(sdata, ht_cap, IEEE80211_HT_CAP_SGI_40); + /* Allow user to disable SGI-20 (SGI-40 is handled above) */ + __check_htcap_disable(sdata, ht_cap, IEEE80211_HT_CAP_SGI_20); + /* Allow user to disable the max-AMSDU bit. */ __check_htcap_disable(sdata, ht_cap, IEEE80211_HT_CAP_MAX_AMSDU); |