From 499ca4cbe0ca2ee126c18a294f11d4c07a1699b4 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 12 Sep 2023 14:09:26 +0200 Subject: [PATCH] hostapd: fix bringing up AP in AP+mesh configurations Pass the correct frequency + secondary channel offset to hostapd Signed-off-by: Felix Fietkau --- .../services/hostapd/src/wpa_supplicant/ucode.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/network/services/hostapd/src/wpa_supplicant/ucode.c b/package/network/services/hostapd/src/wpa_supplicant/ucode.c index d120ed6217d..55d22584ff4 100644 --- a/package/network/services/hostapd/src/wpa_supplicant/ucode.c +++ b/package/network/services/hostapd/src/wpa_supplicant/ucode.c @@ -2,6 +2,7 @@ #include "utils/common.h" #include "utils/ucode.h" #include "drivers/driver.h" +#include "ap/hostapd.h" #include "wpa_supplicant_i.h" #include "wps_supplicant.h" #include "bss.h" @@ -225,6 +226,15 @@ uc_wpas_iface_status(uc_vm_t *vm, size_t nargs) ucv_object_add(ret, "frequency", ucv_int64_new(bss->freq)); } +#ifdef CONFIG_MESH + if (wpa_s->ifmsh) { + struct hostapd_iface *ifmsh = wpa_s->ifmsh; + + ucv_object_add(ret, "sec_chan_offset", ucv_int64_new(ifmsh->conf->secondary_channel)); + ucv_object_add(ret, "frequency", ucv_int64_new(ifmsh->freq)); + } +#endif + return ret; } -- 2.30.2