--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2040,6 +2040,8 @@ void ibss_mesh_setup_freq(struct wpa_sup
+@@ -2060,6 +2060,8 @@ void ibss_mesh_setup_freq(struct wpa_sup
struct hostapd_freq_params vht_freq;
int chwidth, seg0, seg1;
u32 vht_caps = 0;
freq->freq = ssid->frequency;
-@@ -2116,8 +2118,11 @@ void ibss_mesh_setup_freq(struct wpa_sup
+@@ -2136,8 +2138,11 @@ void ibss_mesh_setup_freq(struct wpa_sup
return;
/* Check primary channel flags */
#ifdef CONFIG_HT_OVERRIDES
if (ssid->disable_ht40)
-@@ -2143,8 +2148,11 @@ void ibss_mesh_setup_freq(struct wpa_sup
+@@ -2163,8 +2168,11 @@ void ibss_mesh_setup_freq(struct wpa_sup
return;
/* Check secondary channel flags */
freq->channel = pri_chan->chan;
-@@ -2234,8 +2242,11 @@ void ibss_mesh_setup_freq(struct wpa_sup
+@@ -2254,8 +2262,11 @@ void ibss_mesh_setup_freq(struct wpa_sup
return;
/* Back to HT configuration if channel not usable */
}
chwidth = VHT_CHANWIDTH_80MHZ;
-@@ -2255,10 +2266,11 @@ void ibss_mesh_setup_freq(struct wpa_sup
+@@ -2275,10 +2286,11 @@ void ibss_mesh_setup_freq(struct wpa_sup
if (!chan)
continue;