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

hostapd: Use helper function to avoid duplicate deinit calls

Browse source 
These three calls were used already in three different paths. Use a
helper function to avoid adding even more copies of this.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-05-31 15:57:36 +03:00
parent ac1a224092
commit 438e13339d
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/ap/hostapd.c
View file

@ -437,6 +437,14 @@ static int hostapd_flush_old_stations(struct hostapd_data *hapd, u16 reason)
} }
static void hostapd_bss_deinit_no_free(struct hostapd_data *hapd)
{
hostapd_free_stas(hapd);
hostapd_flush_old_stations(hapd, WLAN_REASON_DEAUTH_LEAVING);
hostapd_clear_wep(hapd);
}
/** /**
* hostapd_validate_bssid_configuration - Validate BSSID configuration * hostapd_validate_bssid_configuration - Validate BSSID configuration
* @iface: Pointer to interface data * @iface: Pointer to interface data
@ -1233,10 +1241,7 @@ int hostapd_setup_interface_complete(struct hostapd_iface *iface, int err)
if (hostapd_setup_bss(hapd, j == 0)) { if (hostapd_setup_bss(hapd, j == 0)) {
do { do {
hapd = iface->bss[j]; hapd = iface->bss[j];
hostapd_free_stas(hapd); hostapd_bss_deinit_no_free(hapd);
hostapd_flush_old_stations(
hapd, WLAN_REASON_DEAUTH_LEAVING);
hostapd_clear_wep(hapd);
hostapd_free_hapd_data(hapd); hostapd_free_hapd_data(hapd);
} while (j-- > 0); } while (j-- > 0);
goto fail; goto fail;
@ -1359,9 +1364,7 @@ static void hostapd_bss_deinit(struct hostapd_data *hapd)
{ {
wpa_printf(MSG_DEBUG, "%s: deinit bss %s", __func__, wpa_printf(MSG_DEBUG, "%s: deinit bss %s", __func__,
hapd->conf->iface); hapd->conf->iface);
hostapd_free_stas(hapd); hostapd_bss_deinit_no_free(hapd);
hostapd_flush_old_stations(hapd, WLAN_REASON_DEAUTH_LEAVING);
hostapd_clear_wep(hapd);
hostapd_cleanup(hapd); hostapd_cleanup(hapd);
} }
@ -1723,9 +1726,7 @@ int hostapd_disable_iface(struct hostapd_iface *hapd_iface)
/* same as hostapd_interface_deinit without deinitializing ctrl-iface */ /* same as hostapd_interface_deinit without deinitializing ctrl-iface */
for (j = 0; j < hapd_iface->num_bss; j++) { for (j = 0; j < hapd_iface->num_bss; j++) {
struct hostapd_data *hapd = hapd_iface->bss[j]; struct hostapd_data *hapd = hapd_iface->bss[j];
hostapd_free_stas(hapd); hostapd_bss_deinit_no_free(hapd);
hostapd_flush_old_stations(hapd, WLAN_REASON_DEAUTH_LEAVING);
hostapd_clear_wep(hapd);
hostapd_free_hapd_data(hapd); hostapd_free_hapd_data(hapd);
} }