jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

P2P: Remove duplicated code from get_shared_radio_freqs_data()

Browse source 
Remove the seperation between getting the local interface frequency and
other interfaces frequencies since going over all the radio interfaces
includes the local interface.

Signed-off-by: Avraham Stern <avraham.stern@intel.com>
This commit is contained in:
Avraham Stern 2014-05-19 10:05:36 +03:00 committed by Jouni Malinen
parent 504df28a1d
commit 0a816e8cbf
1 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
wpa_supplicant/wpa_supplicant.c
View file

@ -4674,29 +4674,11 @@ int get_shared_radio_freqs_data(struct wpa_supplicant *wpa_s,
"Determining shared radio frequencies (max len %u)", len); "Determining shared radio frequencies (max len %u)", len);
os_memset(freqs_data, 0, sizeof(struct wpa_used_freq_data) * len); os_memset(freqs_data, 0, sizeof(struct wpa_used_freq_data) * len);
/* First add the frequency of the local interface */
if (wpa_s->current_ssid != NULL && wpa_s->assoc_freq != 0) {
if (wpa_s->current_ssid->mode == WPAS_MODE_AP ||
wpa_s->current_ssid->mode == WPAS_MODE_P2P_GO)
freqs_data[idx++].freq = wpa_s->current_ssid->frequency;
else if (wpa_drv_get_bssid(wpa_s, bssid) == 0)
freqs_data[idx++].freq = wpa_s->assoc_freq;
if (idx && wpa_s->current_ssid->mode == WPAS_MODE_INFRA) {
freqs_data[0].flags = wpa_s->current_ssid->p2p_group ?
WPA_FREQ_USED_BY_P2P_CLIENT :
WPA_FREQ_USED_BY_INFRA_STATION;
}
}
dl_list_for_each(ifs, &wpa_s->radio->ifaces, struct wpa_supplicant, dl_list_for_each(ifs, &wpa_s->radio->ifaces, struct wpa_supplicant,
radio_list) { radio_list) {
if (idx == len) if (idx == len)
break; break;
if (wpa_s == ifs)
continue;
if (ifs->current_ssid == NULL || ifs->assoc_freq == 0) if (ifs->current_ssid == NULL || ifs->assoc_freq == 0)
continue; continue;