bmips: Build U-Boot into the XG6846 target
[openwrt/openwrt.git] / package / network / services / hostapd / patches / 464-fix-mesh-obss-check.patch
index 566a6d74da189a6014065221b72f00aba60e6633..664f27bd63ad645cd70f051860c03f13520d92d8 100644 (file)
@@ -1,19 +1,18 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Tue, 14 Nov 2017 12:38:08 +0100
+Subject: [PATCH] Fix issues with disabling obss scan when using fixed_freq on
+ mesh
+
 --- a/wpa_supplicant/wpa_supplicant.c
 +++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2217,11 +2217,13 @@ void ibss_mesh_setup_freq(struct wpa_sup
-       for (j = 0; j < wpa_s->last_scan_res_used; j++) {
-               struct wpa_bss *bss = wpa_s->last_scan_res[j];
+@@ -3100,6 +3100,10 @@ void ibss_mesh_setup_freq(struct wpa_sup
  
--              if (ssid->mode != WPAS_MODE_IBSS)
-+              /* Don't adjust control freq in case of fixed_freq */
-+              if (ssid->fixed_freq) {
-+                      obss_scan = 0;
-                       break;
-+              }
+       freq->freq = ssid->frequency;
  
--              /* Don't adjust control freq in case of fixed_freq */
--              if (ssid->fixed_freq)
-+              if (ssid->mode != WPAS_MODE_IBSS)
-                       break;
++      if (ssid->fixed_freq) {
++              obss_scan = 0;
++      }
++
+       if (ssid->mode == WPAS_MODE_IBSS && !ssid->fixed_freq) {
+               struct wpa_bss *bss = ibss_find_existing_bss(wpa_s, ssid);
  
-               if (!bss_is_ibss(bss))