commit bc0784d951470ca6597239f1bae6e59caf49fb10
author Ben Greear <greearb@candelatech.com> Wed Dec 12 16:56:20 2012 -0800
committer Johannes Berg <johannes.berg@intel.com> Thu Jan 03 13:01:14 2013 +0100
tree c87ecf36682ffff4860279b1f2ebf197ec1bf1e3
parent 694c61863286e963e90c75e701a0f79039da865d

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>

net/mac80211/main.c

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 1b087ff..0c0d4ca 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -537,6 +537,7 @@
 
 	.cap_info = cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH_20_40 |
 				IEEE80211_HT_CAP_MAX_AMSDU |
+				IEEE80211_HT_CAP_SGI_20 |
 				IEEE80211_HT_CAP_SGI_40),
 	.mcs = {
 		.rx_mask = { 0xff, 0xff, 0xff, 0xff, 0xff,