mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
000a3fef0a
Clean up conflicts/provides/depends hell and add PROVIDES for
eapol-test variants while at it.
Update mesh-DFS patchset from Peter Oh to v5 (with local fixes) which
allows to drop two revert-patches for upstream commits which previously
were necessary to un-break mesh-DFS support.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(backported from 78f1974bc5)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
20 lines
561 B
Diff
20 lines
561 B
Diff
--- a/wpa_supplicant/wpa_supplicant.c
|
|
+++ b/wpa_supplicant/wpa_supplicant.c
|
|
@@ -2124,11 +2124,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))
|