hostapd: fix misplaced radar-detected ubus notification

Fixes: 94037ab6b031 ("hostapd: update to 2022-07-29")
Signed-off-by: Chad Monroe <chad@monroe.io>
Link: https://github.com/openwrt/openwrt/pull/23815
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/package/network/services/hostapd/patches/600-ubus_support.patch b/package/network/services/hostapd/patches/600-ubus_support.patch
index 290f2e8e4a8c92d61fad671d518f0560782c329d..1c7f013c37a2be50a63f3b6a1d5a6ee15e9e9efa 100644 (file)
--- a/package/network/services/hostapd/patches/600-ubus_support.patch
+++ b/package/network/services/hostapd/patches/600-ubus_support.patch
@@ -81,15 +81,15 @@ probe/assoc/auth requests via object subscribe.
  
 --- a/src/ap/dfs.c
 +++ b/src/ap/dfs.c
-@@ -1295,6 +1295,8 @@ int hostapd_dfs_pre_cac_expired(struct h
+@@ -1543,6 +1543,8 @@ int hostapd_dfs_radar_detected(struct ho
                "freq=%d ht_enabled=%d chan_offset=%d chan_width=%d cf1=%d cf2=%d",
                freq, ht_enabled, chan_offset, chan_width, cf1, cf2);
  
 +      hostapd_ubus_notify_radar_detected(iface, freq, chan_width, cf1, cf2);
 +
+       iface->radar_detected = true;
+ 
        /* Proceed only if DFS is not offloaded to the driver */
-       if (iface->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD)
-               return 0;
 --- a/src/ap/drv_callbacks.c
 +++ b/src/ap/drv_callbacks.c
 @@ -333,6 +333,10 @@ int hostapd_notif_assoc(struct hostapd_d