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

wpa_priv: Add support for global driver interface context

Browse source 
This is needed with driver_nl80211.c to be able to use the newer
wpa_driver_ops::init2() alternative.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-09-05 12:03:18 +03:00
parent 85f4381e14
commit 20396ab8e4
1 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

27
wpa_supplicant/wpa_priv.c
View file

@ -31,6 +31,7 @@ struct wpa_priv_interface {
const struct wpa_driver_ops *driver; const struct wpa_driver_ops *driver;
void *drv_priv; void *drv_priv;
void *drv_global_priv;
struct sockaddr_un drv_addr; struct sockaddr_un drv_addr;
int wpas_registered; int wpas_registered;
@ -48,6 +49,10 @@ static void wpa_priv_cmd_register(struct wpa_priv_interface *iface,
if (iface->driver->deinit) if (iface->driver->deinit)
iface->driver->deinit(iface->drv_priv); iface->driver->deinit(iface->drv_priv);
iface->drv_priv = NULL; iface->drv_priv = NULL;
if (iface->drv_global_priv) {
iface->driver->global_deinit(iface->drv_global_priv);
iface->drv_global_priv = NULL;
}
iface->wpas_registered = 0; iface->wpas_registered = 0;
} }
@ -58,10 +63,24 @@ static void wpa_priv_cmd_register(struct wpa_priv_interface *iface,
iface->l2 = NULL; iface->l2 = NULL;
} }
if (iface->driver->init == NULL) if (iface->driver->init2) {
if (iface->driver->global_init) {
iface->drv_global_priv = iface->driver->global_init();
if (!iface->drv_global_priv) {
wpa_printf(MSG_INFO,
"Failed to initialize driver global context");
return; return;
}
} else {
iface->drv_global_priv = NULL;
}
iface->drv_priv = iface->driver->init2(iface, iface->ifname,
iface->drv_global_priv);
} else if (iface->driver->init) {
iface->drv_priv = iface->driver->init(iface, iface->ifname); iface->drv_priv = iface->driver->init(iface, iface->ifname);
} else {
return;
}
if (iface->drv_priv == NULL) { if (iface->drv_priv == NULL) {
wpa_printf(MSG_DEBUG, "Failed to initialize driver wrapper"); wpa_printf(MSG_DEBUG, "Failed to initialize driver wrapper");
return; return;
@ -87,6 +106,10 @@ static void wpa_priv_cmd_unregister(struct wpa_priv_interface *iface,
if (iface->driver->deinit) if (iface->driver->deinit)
iface->driver->deinit(iface->drv_priv); iface->driver->deinit(iface->drv_priv);
iface->drv_priv = NULL; iface->drv_priv = NULL;
if (iface->drv_global_priv) {
iface->driver->global_deinit(iface->drv_global_priv);
iface->drv_global_priv = NULL;
}
iface->wpas_registered = 0; iface->wpas_registered = 0;
} }
} }