{nl,cfg,mac}80211: Allow user to see/configure HT protection mode

This patch introduces a new mesh configuration parameter "ht_opmode" and will
allow user to check the current HT protection mode selected. Users could
configure the protection mode by the command "iw mesh_iface set mesh_param
mesh_ht_protection_mode=2". The default protection mode of mesh is set to
non-HT mixed mode.

Signed-off-by: Ashok Nagarajan <ashok@cozybit.com>
Reviewed-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 9 insertions, 0 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 39b1fffb24f4..0221270c0ddf 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1538,6 +1538,11 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
                         return -ENOTSUPP;
                 conf->rssi_threshold = nconf->rssi_threshold;
         }
+        if (_chg_mesh_attr(NL80211_MESHCONF_HT_OPMODE, mask)) {
+                conf->ht_opmode = nconf->ht_opmode;
+                sdata->vif.bss_conf.ht_operation_mode = nconf->ht_opmode;
+                ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_HT);
+        }
         return 0;
 }
 
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 0fabb8bae9fb..0a21e4e55f43 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -595,12 +595,15 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)
         set_bit(MESH_WORK_HOUSEKEEPING, &ifmsh->wrkq_flags);
         ieee80211_mesh_root_setup(ifmsh);
         ieee80211_queue_work(&local->hw, &sdata->work);
+        sdata->vif.bss_conf.ht_operation_mode =
+                                ifmsh->mshcfg.ht_opmode;
         sdata->vif.bss_conf.beacon_int = MESH_DEFAULT_BEACON_INTERVAL;
         sdata->vif.bss_conf.basic_rates =
                 ieee80211_mandatory_rates(sdata->local,
                                           sdata->local->hw.conf.channel->band);
         ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON |
                                                 BSS_CHANGED_BEACON_ENABLED |
+                                                BSS_CHANGED_HT |
                                                 BSS_CHANGED_BASIC_RATES |
                                                 BSS_CHANGED_BEACON_INT);
 }
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 2e0ae7310697..8cc8461b48a0 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -157,6 +157,7 @@ out:
 
         if (sdata->vif.bss_conf.ht_operation_mode != ht_opmode) {
                 sdata->vif.bss_conf.ht_operation_mode = ht_opmode;
+                sdata->u.mesh.mshcfg.ht_opmode = ht_opmode;
                 changed = BSS_CHANGED_HT;
                 mpl_dbg("mesh_plink %pM: protection mode changed to %d",
                         sdata->vif.addr, ht_opmode);