DFS offload: Skip user space processing for CAC operations

If DFS is offloaded to the driver, hostapd should not be performing
these operations. Send the relevant control interface events to provide
information to upper layer software that may use such events to track
DFS/CAC state. This makes the offloaded DFS implementation more
consistent with the DFS-in-hostapd behavior.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/src/ap/dfs.c b/src/ap/dfs.c
index fc8d7adf71df98c72a908166beb8a41faf9cbf2f..46a1d86859558e501dc058b0ac12ab14cacaf753 100644 (file)
--- a/src/ap/dfs.c
+++ b/src/ap/dfs.c
@@ -748,11 +748,19 @@ int hostapd_dfs_complete_cac(struct hostapd_iface *iface, int success, int freq,
 
        if (success) {
                /* Complete iface/ap configuration */
-               set_dfs_state(iface, freq, ht_enabled, chan_offset,
-                             chan_width, cf1, cf2,
-                             HOSTAPD_CHAN_DFS_AVAILABLE);
-               iface->cac_started = 0;
-               hostapd_setup_interface_complete(iface, 0);
+               if (iface->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD) {
+                       /* Complete AP configuration for the first bring up. */
+                       if (iface->state != HAPD_IFACE_ENABLED)
+                               hostapd_setup_interface_complete(iface, 0);
+                       else
+                               iface->cac_started = 0;
+               } else {
+                       set_dfs_state(iface, freq, ht_enabled, chan_offset,
+                                     chan_width, cf1, cf2,
+                                     HOSTAPD_CHAN_DFS_AVAILABLE);
+                       iface->cac_started = 0;
+                       hostapd_setup_interface_complete(iface, 0);
+               }
        }
 
        return 0;
@@ -934,13 +942,17 @@ int hostapd_dfs_radar_detected(struct hostapd_iface *iface, int freq,
 {
        int res;
 
-       if (!iface->conf->ieee80211h)
-               return 0;
-
        wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, DFS_EVENT_RADAR_DETECTED
                "freq=%d ht_enabled=%d chan_offset=%d chan_width=%d cf1=%d cf2=%d",
                freq, ht_enabled, chan_offset, chan_width, cf1, cf2);
 
+       /* Proceed only if DFS is not offloaded to the driver */
+       if (iface->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD)
+               return 0;
+
+       if (!iface->conf->ieee80211h)
+               return 0;
+
        /* mark radar frequency as invalid */
        set_dfs_state(iface, freq, ht_enabled, chan_offset, chan_width,
                      cf1, cf2, HOSTAPD_CHAN_DFS_UNAVAILABLE);
@@ -964,6 +976,11 @@ int hostapd_dfs_nop_finished(struct hostapd_iface *iface, int freq,
        wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, DFS_EVENT_NOP_FINISHED
                "freq=%d ht_enabled=%d chan_offset=%d chan_width=%d cf1=%d cf2=%d",
                freq, ht_enabled, chan_offset, chan_width, cf1, cf2);
+
+       /* Proceed only if DFS is not offloaded to the driver */
+       if (iface->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD)
+               return 0;
+
        /* TODO add correct implementation here */
        set_dfs_state(iface, freq, ht_enabled, chan_offset, chan_width,
                      cf1, cf2, HOSTAPD_CHAN_DFS_USABLE);