Message ID | 1469145175-6598-1-git-send-email-masashi.honma@gmail.com |
---|---|
State | Accepted |
Headers | show |
On Fri, Jul 22, 2016 at 08:52:55AM +0900, Masashi Honma wrote: > Previouly, HT capability IE and HT information IE was included in > beacon and Mesh Peering Open/Confirm frames even though HT is > disabled by disable_ht=1. This patch removes these. Thanks, applied.
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 18468c9..848f23f 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -3829,6 +3829,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..aa4efd3 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -1873,6 +1873,12 @@ 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;
Previouly, HT capability IE and HT information IE was included in beacon and Mesh Peering Open/Confirm frames even though HT is disabled by disable_ht=1. This patch removes these. Signed-off-by: Masashi Honma <masashi.honma@gmail.com> --- src/drivers/driver_nl80211.c | 6 ++++++ wpa_supplicant/wpa_supplicant.c | 6 ++++++ 2 files changed, 12 insertions(+)