DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

P2P: Fix shared freq check and support AP mode validation

Browse source 
The previous commit did not use the correct pointer in all operations
and was specific to station mode interfaces. Fix and extend it to work
with AP/GO interfaces, too.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2012-04-08 20:42:45 +03:00
parent 4b15620609
commit 86ae2e8a42
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
wpa_supplicant/p2p_supplicant.c
View file

@ -2619,17 +2619,21 @@ static int wpas_check_freq_conflict(struct wpa_supplicant *wpa_s, int freq)
continue; continue;
if (iface->current_ssid == NULL || iface->assoc_freq == 0) if (iface->current_ssid == NULL || iface->assoc_freq == 0)
continue; continue;
if (wpa_drv_get_bssid(iface, bssid) == 0) { if (iface->current_ssid->mode == WPAS_MODE_AP ||
if (freq != (int) wpa_s->assoc_freq) { iface->current_ssid->mode == WPAS_MODE_P2P_GO)
wpa_printf(MSG_DEBUG, "P2P: Frequency " shared_freq = iface->current_ssid->frequency;
"conflict - %s connected on %d MHz " else if (wpa_drv_get_bssid(iface, bssid) == 0)
"- new connection on %d MHz", shared_freq = iface->assoc_freq;
wpa_s->ifname, wpa_s->assoc_freq, else
freq); shared_freq = 0;
if (shared_freq && freq != shared_freq) {
wpa_printf(MSG_DEBUG, "P2P: Frequency conflict - %s "
"connected on %d MHz - new connection on "
"%d MHz", iface->ifname, shared_freq, freq);
return 1; return 1;
} }
} }
}
shared_freq = wpa_drv_shared_freq(wpa_s); shared_freq = wpa_drv_shared_freq(wpa_s);
if (shared_freq > 0 && shared_freq != freq) { if (shared_freq > 0 && shared_freq != freq) {