summaryrefslogtreecommitdiffstats
path: root/net/mac80211/util.c
diff options
context:
space:
mode:
authorAshok Nagarajan <ashok@cozybit.com>2012-04-30 14:20:29 -0700
committerJohn W. Linville <linville@tuxdriver.com>2012-05-08 21:53:57 -0400
commit431e31542383b71bc5f2642572a1e6ef07f1bb87 (patch)
tree39d2cbc1b9e4321b27b6938034de67c4dedcdf9f /net/mac80211/util.c
parentef9456a85dabe2222a4cb80fe8eef6361170c55d (diff)
downloadop-kernel-dev-431e31542383b71bc5f2642572a1e6ef07f1bb87.zip
op-kernel-dev-431e31542383b71bc5f2642572a1e6ef07f1bb87.tar.gz
mac80211: Advertise HT protection mode in IEs
Signed-off-by: Ashok Nagarajan <ashok@cozybit.com> Reviewed-by: Thomas Pedersen <thomas@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r--net/mac80211/util.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index d9a747d..22f2216b 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1663,7 +1663,8 @@ u8 *ieee80211_ie_build_ht_cap(u8 *pos, struct ieee80211_sta_ht_cap *ht_cap,
u8 *ieee80211_ie_build_ht_oper(u8 *pos, struct ieee80211_sta_ht_cap *ht_cap,
struct ieee80211_channel *channel,
- enum nl80211_channel_type channel_type)
+ enum nl80211_channel_type channel_type,
+ u16 prot_mode)
{
struct ieee80211_ht_operation *ht_oper;
/* Build HT Information */
@@ -1689,11 +1690,7 @@ u8 *ieee80211_ie_build_ht_oper(u8 *pos, struct ieee80211_sta_ht_cap *ht_cap,
channel_type != NL80211_CHAN_HT20)
ht_oper->ht_param |= IEEE80211_HT_PARAM_CHAN_WIDTH_ANY;
- /*
- * Note: According to 802.11n-2009 9.13.3.1, HT Protection field and
- * RIFS Mode are reserved in IBSS mode, therefore keep them at 0
- */
- ht_oper->operation_mode = 0x0000;
+ ht_oper->operation_mode = cpu_to_le16(prot_mode);
ht_oper->stbc_param = 0x0000;
/* It seems that Basic MCS set and Supported MCS set
OpenPOWER on IntegriCloud