aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasashi Honma <masashi.honma@gmail.com>2016-07-21 23:52:55 (GMT)
committerJouni Malinen <j@w1.fi>2016-07-23 19:04:16 (GMT)
commit3388e7b96f1bd0c5e3b2a0d31ecfe3e7bd445d43 (patch)
tree7c371a6192c90bf12d8b41ebafc632463f3e8aa8
parent4ac2ea57382f2487c5f930609528801cf4583e20 (diff)
downloadhostap-3388e7b96f1bd0c5e3b2a0d31ecfe3e7bd445d43.zip
hostap-3388e7b96f1bd0c5e3b2a0d31ecfe3e7bd445d43.tar.gz
hostap-3388e7b96f1bd0c5e3b2a0d31ecfe3e7bd445d43.tar.bz2
mesh: Remove HT IEs if HT is disabled
Previously, HT capability IE and HT information IE were included in Beacon and Mesh Peering Open/Confirm frames even if HT is disabled with disable_ht=1. This patch removes these. Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
-rw-r--r--src/drivers/driver_nl80211.c6
-rw-r--r--wpa_supplicant/wpa_supplicant.c7
2 files changed, 13 insertions, 0 deletions
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 0bbcd8a..be32c5d 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -3788,6 +3788,12 @@ static int nl80211_put_freq_params(struct nl_msg *msg,
wpa_printf(MSG_DEBUG, " * channel_type=%d", ct);
if (nla_put_u32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE, ct))
return -ENOBUFS;
+ } else {
+ wpa_printf(MSG_DEBUG, " * channel_type=%d",
+ NL80211_CHAN_NO_HT);
+ if (nla_put_u32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
+ NL80211_CHAN_NO_HT))
+ return -ENOBUFS;
}
return 0;
}
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 6999bbb..7ed7efa 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1873,6 +1873,13 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
if (!mode)
return;
+#ifdef CONFIG_HT_OVERRIDES
+ if (ssid->disable_ht) {
+ freq->ht_enabled = 0;
+ return;
+ }
+#endif /* CONFIG_HT_OVERRIDES */
+
freq->ht_enabled = ht_supported(mode);
if (!freq->ht_enabled)
return;