From 3388e7b96f1bd0c5e3b2a0d31ecfe3e7bd445d43 Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Fri, 22 Jul 2016 08:52:55 +0900 Subject: [PATCH] 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 --- src/drivers/driver_nl80211.c | 6 ++++++ wpa_supplicant/wpa_supplicant.c | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 0bbcd8aa1..be32c5da2 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 6999bbb46..7ed7efa4a 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;