@@ -217,6 +217,7 @@ static int hostapd_driver_init(struct hostapd_iface *iface)
iface->extended_capa_mask = capa.extended_capa_mask;
iface->extended_capa_len = capa.extended_capa_len;
iface->drv_max_acl_mac_addrs = capa.max_acl_mac_addrs;
+ iface->csa_supported = !!(capa.flags & WPA_DRIVER_FLAGS_AP_CSA);
}
return 0;
@@ -2333,6 +2333,14 @@ int hostapd_switch_channel(struct hostapd_data *hapd,
struct csa_settings *settings)
{
int ret;
+ if (!hapd->iface)
+ return -1;
+
+ if (!hapd->iface->csa_supported) {
+ wpa_printf(MSG_ERROR, "CSA is not supported");
+ return -1;
+ }
+
ret = hostapd_fill_csa_settings(hapd->iface, settings);
if (ret)
return ret;
@@ -350,6 +350,7 @@ struct hostapd_iface {
unsigned int cs_c_off_beacon;
unsigned int cs_c_off_proberesp;
int csa_in_progress;
+ unsigned int csa_supported:1;
unsigned int dfs_cac_ms;
struct os_reltime dfs_cac_start;
@@ -569,6 +569,7 @@ int wpa_supplicant_create_ap(struct wpa_supplicant *wpa_s,
hapd_iface->extended_capa = wpa_s->extended_capa;
hapd_iface->extended_capa_mask = wpa_s->extended_capa_mask;
hapd_iface->extended_capa_len = wpa_s->extended_capa_len;
+ hapd_iface->csa_supported = wpa_s->csa_supported;
wpa_s->ap_iface->conf = conf = hostapd_config_defaults();
if (conf == NULL) {
@@ -3664,6 +3664,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s,
wpa_s->extended_capa_len = capa.extended_capa_len;
wpa_s->num_multichan_concurrent =
capa.num_multichan_concurrent;
+ wpa_s->csa_supported = !!(capa.flags & WPA_DRIVER_FLAGS_AP_CSA);
}
if (wpa_s->max_remain_on_chan == 0)
wpa_s->max_remain_on_chan = 1000;
@@ -860,6 +860,8 @@ struct wpa_supplicant {
struct wpa_radio_work *connect_work;
unsigned int ext_work_id;
+
+ unsigned int csa_supported:1;
};