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>

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 61cd391c32a36e7f37106aad985d3da7b0701f96..bb1a3e62a66a8cd059d0105b15f3045542634344 100644 (file)
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -164,7 +164,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
                pos = ieee80211_ie_build_ht_cap(pos, &sband->ht_cap,
                                                sband->ht_cap.cap);
                pos = ieee80211_ie_build_ht_oper(pos, &sband->ht_cap,
-                                                chan, channel_type);
+                                                chan, channel_type, 0);
        }
 
        if (local->hw.queues >= IEEE80211_NUM_ACS) {

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 6cd89d414f22066aa35da59b71ac3cd4151c31e5..ae046b52d5e24bf31563f5aa52811c6eda2bf5b2 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1497,7 +1497,8 @@ u8 *ieee80211_ie_build_ht_cap(u8 *pos, struct ieee80211_sta_ht_cap *ht_cap,
                              u16 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);
 
 /* internal work items */
 void ieee80211_work_init(struct ieee80211_local *local);

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 598a96a3a051acc4231da2ab108ebddf71b9f271..8a952e04690abbc6981d7f0ce5097f7c9f807100 100644 (file)
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -396,7 +396,8 @@ int mesh_add_ht_oper_ie(struct sk_buff *skb,
                return -ENOMEM;
 
        pos = skb_put(skb, 2 + sizeof(struct ieee80211_ht_operation));
-       ieee80211_ie_build_ht_oper(pos, ht_cap, channel, channel_type);
+       ieee80211_ie_build_ht_oper(pos, ht_cap, channel, channel_type,
+                                  sdata->vif.bss_conf.ht_operation_mode);
 
        return 0;
 }

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index d9a747d387f046c46c6a67dc3a00ca3e81a5a5db..22f2216b397ea37b5845efc359c7d0e519261aec 100644 (file)
--- 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