diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2015-03-05 16:20:03 +0200 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2015-03-05 17:25:13 +0200 |
| commit | 6e9023ea499ea9a89b0e858c85e32b455d57264c (patch) | |
| tree | 443006428a3352e0bb678df3957fecff623a2e91 | |
| parent | 02e42ab75b3b5e971794bf23768d4c8226c432ff (diff) | |
| download | hostap-6e9023ea499ea9a89b0e858c85e32b455d57264c.tar.gz | |
DFS: Allow wpa_supplicant AP mode to use non-offloaded DFS
This extends the hostapd-like setup of DFS-in-userspace for
wpa_supplicant AP mode operations.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
| -rw-r--r-- | src/drivers/driver_nl80211.c | 3 | ||||
| -rw-r--r-- | wpa_supplicant/ap.c | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 2dce242a3..2a2ef6f18 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -4301,7 +4301,8 @@ static int wpa_driver_nl80211_ap(struct wpa_driver_nl80211_data *drv, return -1; } - if (nl80211_set_channel(drv->first_bss, ¶ms->freq, 0)) { + if (params->freq.freq && + nl80211_set_channel(drv->first_bss, ¶ms->freq, 0)) { if (old_mode != nlmode) wpa_driver_nl80211_set_mode(drv->first_bss, old_mode); nl80211_remove_monitor_interface(drv); diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c index 5950207b9..ea5b2b4da 100644 --- a/wpa_supplicant/ap.c +++ b/wpa_supplicant/ap.c @@ -166,6 +166,13 @@ static int wpa_supplicant_conf_ap(struct wpa_supplicant *wpa_s, wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); + if (ieee80211_is_dfs(ssid->frequency) && wpa_s->conf->country[0]) { + conf->ieee80211h = 1; + conf->ieee80211d = 1; + conf->country[0] = wpa_s->conf->country[0]; + conf->country[1] = wpa_s->conf->country[1]; + } + #ifdef CONFIG_P2P if (conf->hw_mode == HOSTAPD_MODE_IEEE80211G && (ssid->mode == WPAS_MODE_P2P_GO || @@ -567,6 +574,9 @@ int wpa_supplicant_create_ap(struct wpa_supplicant *wpa_s, else params.uapsd = -1; + if (ieee80211_is_dfs(params.freq.freq)) + params.freq.freq = 0; /* set channel after CAC */ + if (wpa_drv_associate(wpa_s, ¶ms) < 0) { wpa_msg(wpa_s, MSG_INFO, "Failed to start AP functionality"); return -1; |