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

Add get_radio_name() driver wrapper for wpa_supplicant

Browse source 
Signed-off-by: Prameela Rani Garnepudi <prameela.g@samsung.com>
This commit is contained in:
Prameela Rani Garnepudi 2014-03-18 12:05:22 +00:00 committed by Jouni Malinen
parent d06ecab344
commit 95bf699f76
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wpa_supplicant/driver_i.h
View file

@ -206,6 +206,14 @@ static inline const char * wpa_drv_get_ifname(struct wpa_supplicant *wpa_s)
return NULL; return NULL;
} }
static inline const char *
wpa_driver_get_radio_name(struct wpa_supplicant *wpa_s)
{
if (wpa_s->driver->get_radio_name)
return wpa_s->driver->get_radio_name(wpa_s->drv_priv);
return NULL;
}
static inline const u8 * wpa_drv_get_mac_addr(struct wpa_supplicant *wpa_s) static inline const u8 * wpa_drv_get_mac_addr(struct wpa_supplicant *wpa_s)
{ {
if (wpa_s->driver->get_mac_addr) { if (wpa_s->driver->get_mac_addr) {

7
wpa_supplicant/wpa_supplicant.c
View file

@ -3361,10 +3361,7 @@ next_driver:
os_strlcpy(wpa_s->ifname, ifname, sizeof(wpa_s->ifname)); os_strlcpy(wpa_s->ifname, ifname, sizeof(wpa_s->ifname));
} }
if (wpa_s->driver->get_radio_name) rn = wpa_driver_get_radio_name(wpa_s);
rn = wpa_s->driver->get_radio_name(wpa_s->drv_priv);
else
rn = NULL;
if (rn && rn[0] == '\0') if (rn && rn[0] == '\0')
rn = NULL; rn = NULL;
@ -4534,7 +4531,7 @@ int get_shared_radio_freqs(struct wpa_supplicant *wpa_s,
} }
/* If get_radio_name is not supported, use only the local freq */ /* If get_radio_name is not supported, use only the local freq */
if (!wpa_s->driver->get_radio_name) { if (!wpa_driver_get_radio_name(wpa_s)) {
freq = wpa_drv_shared_freq(wpa_s); freq = wpa_drv_shared_freq(wpa_s);
if (freq > 0 && idx < len && if (freq > 0 && idx < len &&
(idx == 0 || freq_array[0] != freq)) (idx == 0 || freq_array[0] != freq))