|
@@ -3361,10 +3361,7 @@ next_driver:
|
|
|
os_strlcpy(wpa_s->ifname, ifname, sizeof(wpa_s->ifname));
|
|
|
}
|
|
|
|
|
|
- if (wpa_s->driver->get_radio_name)
|
|
|
- rn = wpa_s->driver->get_radio_name(wpa_s->drv_priv);
|
|
|
- else
|
|
|
- rn = NULL;
|
|
|
+ rn = wpa_driver_get_radio_name(wpa_s);
|
|
|
if (rn && rn[0] == '\0')
|
|
|
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 (!wpa_s->driver->get_radio_name) {
|
|
|
+ if (!wpa_driver_get_radio_name(wpa_s)) {
|
|
|
freq = wpa_drv_shared_freq(wpa_s);
|
|
|
if (freq > 0 && idx < len &&
|
|
|
(idx == 0 || freq_array[0] != freq))
|