diff mbox series

hostapd: Fix 'start_disabled' option being ignored

Message ID 20241104135625.2151387-1-hyang@freebox.fr
State Changes Requested
Headers show
Series hostapd: Fix 'start_disabled' option being ignored | expand

Commit Message

Hancheng Yang Nov. 4, 2024, 1:56 p.m. UTC 
Fix 2 cases where 'start_disabled' were not respected:
- when `ieee802_11_set_beacon` is called for a BSS, same operation will
  be called for all it's colocated BSS(s). Now we set beacon for BSSs
  have already it's beacon setting done.
- replace `ieee802_11_set_beacons` by `ieee802_11_update_beacons` in
  `hostapd_setup_interface_complete_sync` for the same reason.
---
 src/ap/beacon.c  | 3 ++-
 src/ap/hostapd.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

Comments

Jouni Malinen Dec. 22, 2024, 9:51 p.m. UTC | #1 
On Mon, Nov 04, 2024 at 02:56:26PM +0100, Hancheng Yang wrote:
> Fix 2 cases where 'start_disabled' were not respected:
> - when `ieee802_11_set_beacon` is called for a BSS, same operation will
>   be called for all it's colocated BSS(s). Now we set beacon for BSSs
>   have already it's beacon setting done.
> - replace `ieee802_11_set_beacons` by `ieee802_11_update_beacons` in
>   `hostapd_setup_interface_complete_sync` for the same reason.
> ---

Please read the top level CONTRIBUTIONS file and send this again with
the Signed-off-by: line added as described there to allow me to consider
applying the proposed changes.
diff mbox series

Patch

diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index 2e3d90466..36dc18ad3 100644
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -3227,7 +3227,8 @@  int ieee802_11_set_beacon(struct hostapd_data *hapd)
 				continue;
 #endif /* CONFIG_IEEE80211BE */
 
-			if (other->bss[i] && other->bss[i]->started)
+			if (other->bss[i] && other->bss[i]->started &&
+			    other->bss[i]->beacon_set_done)
 				__ieee802_11_set_beacon(other->bss[i]);
 		}
 	}
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index c8751a247..85031d673 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -2744,7 +2744,7 @@  dfs_offload:
 		hostapd_neighbor_set_own_report(iface->bss[j]);
 
 	if (iface->interfaces && iface->interfaces->count > 1)
-		ieee802_11_set_beacons(iface);
+		ieee802_11_update_beacons(iface);
 
 	return 0;