Fix driver operation order in configuration reloading
Some of the driver wrappers need to get set_ieee8021x() call before they can configure keys. Reorder the operations in the reloading of configuration case to match with that expectation.
This commit is contained in:
parent
7f5957abcf
commit
84b2f9909f
1 changed files with 5 additions and 5 deletions
|
@ -78,6 +78,11 @@ int hostapd_reload_config(struct hostapd_iface *iface)
|
||||||
"after reloading configuration");
|
"after reloading configuration");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (hapd->conf->ieee802_1x || hapd->conf->wpa)
|
||||||
|
hapd->drv.set_drv_ieee8021x(hapd, hapd->conf->iface, 1);
|
||||||
|
else
|
||||||
|
hapd->drv.set_drv_ieee8021x(hapd, hapd->conf->iface, 0);
|
||||||
|
|
||||||
if (hapd->conf->wpa && hapd->wpa_auth == NULL)
|
if (hapd->conf->wpa && hapd->wpa_auth == NULL)
|
||||||
hostapd_setup_wpa(hapd);
|
hostapd_setup_wpa(hapd);
|
||||||
else if (hapd->conf->wpa) {
|
else if (hapd->conf->wpa) {
|
||||||
|
@ -106,11 +111,6 @@ int hostapd_reload_config(struct hostapd_iface *iface)
|
||||||
/* try to continue */
|
/* try to continue */
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hapd->conf->ieee802_1x || hapd->conf->wpa)
|
|
||||||
hapd->drv.set_drv_ieee8021x(hapd, hapd->conf->iface, 1);
|
|
||||||
else
|
|
||||||
hapd->drv.set_drv_ieee8021x(hapd, hapd->conf->iface, 0);
|
|
||||||
|
|
||||||
hostapd_config_free(oldconf);
|
hostapd_config_free(oldconf);
|
||||||
|
|
||||||
wpa_printf(MSG_DEBUG, "Reconfigured interface %s", hapd->conf->iface);
|
wpa_printf(MSG_DEBUG, "Reconfigured interface %s", hapd->conf->iface);
|
||||||
|
|
Loading…
Reference in a new issue