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

Share a single wpa_scan_results_free() implementation

Browse source 
There is not really a very good location for this anywhere, but the
function is small enough to live as an inline function for now.
This commit is contained in:
Jouni Malinen 2011-10-22 22:09:40 +03:00
parent d01b205378
commit 9e0e6902a2
5 changed files with 13 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/ap/hw_features.c
View file

@ -407,20 +407,6 @@ static int ieee80211n_check_40mhz_2g4(struct hostapd_iface *iface,
} }
static void wpa_scan_results_free(struct wpa_scan_results *res)
{
size_t i;
if (res == NULL)
return;
for (i = 0; i < res->num; i++)
os_free(res->res[i]);
os_free(res->res);
os_free(res);
}
static void ieee80211n_check_scan(struct hostapd_iface *iface) static void ieee80211n_check_scan(struct hostapd_iface *iface)
{ {
struct wpa_scan_results *scan_res; struct wpa_scan_results *scan_res;

13
src/drivers/driver.h
View file

@ -3564,4 +3564,17 @@ static inline void drv_event_eapol_rx(void *ctx, const u8 *src, const u8 *data,
wpa_supplicant_event(ctx, EVENT_EAPOL_RX, &event); wpa_supplicant_event(ctx, EVENT_EAPOL_RX, &event);
} }
static inline void wpa_scan_results_free(struct wpa_scan_results *res)
{
size_t i;
if (res == NULL)
return;
for (i = 0; i < res->num; i++)
os_free(res->res[i]);
os_free(res->res);
os_free(res);
}
#endif /* DRIVER_H */ #endif /* DRIVER_H */

14
src/drivers/driver_nl80211.c
View file

@ -3065,20 +3065,6 @@ static void wpa_driver_nl80211_check_bss_status(
} }
static void wpa_scan_results_free(struct wpa_scan_results *res)
{
size_t i;
if (res == NULL)
return;
for (i = 0; i < res->num; i++)
os_free(res->res[i]);
os_free(res->res);
os_free(res);
}
static struct wpa_scan_results * static struct wpa_scan_results *
nl80211_get_scan_results(struct wpa_driver_nl80211_data *drv) nl80211_get_scan_results(struct wpa_driver_nl80211_data *drv)
{ {

14
wpa_supplicant/scan.c
View file

@ -1139,17 +1139,3 @@ int wpa_supplicant_update_scan_results(struct wpa_supplicant *wpa_s)
return 0; return 0;
} }
void wpa_scan_results_free(struct wpa_scan_results *res)
{
size_t i;
if (res == NULL)
return;
for (i = 0; i < res->num; i++)
os_free(res->res[i]);
os_free(res->res);
os_free(res);
}

1
wpa_supplicant/scan.h
View file

@ -38,6 +38,5 @@ struct wpabuf * wpa_scan_get_vendor_ie_multi(const struct wpa_scan_res *res,
u32 vendor_type); u32 vendor_type);
struct wpabuf * wpa_scan_get_vendor_ie_multi_beacon( struct wpabuf * wpa_scan_get_vendor_ie_multi_beacon(
const struct wpa_scan_res *res, u32 vendor_type); const struct wpa_scan_res *res, u32 vendor_type);
void wpa_scan_results_free(struct wpa_scan_results *res);
#endif /* SCAN_H */ #endif /* SCAN_H */