6e0fa4a76d
Fix encrypted (or DFS) AP+MESH interface combination in a way similar to how it's done for AP+STA and fix netifd shell script. Refresh patches while at it. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
19 lines
561 B
Diff
19 lines
561 B
Diff
--- a/wpa_supplicant/wpa_supplicant.c
|
|
+++ b/wpa_supplicant/wpa_supplicant.c
|
|
@@ -2097,11 +2097,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];
|
|
|
|
- if (ssid->mode != WPAS_MODE_IBSS)
|
|
+ /* Don't adjust control freq in case of fixed_freq */
|
|
+ if (ssid->fixed_freq) {
|
|
+ obss_scan = 0;
|
|
break;
|
|
+ }
|
|
|
|
- /* Don't adjust control freq in case of fixed_freq */
|
|
- if (ssid->fixed_freq)
|
|
+ if (ssid->mode != WPAS_MODE_IBSS)
|
|
break;
|
|
|
|
if (!bss_is_ibss(bss))
|