WPS: Moved mac_addr and uuid configuration into wps_context
There is no need to complicate EAPOL and EAP interfaces with WPS specific parameters now that wps_context is passed through.
This commit is contained in:
parent
116654ce24
commit
398cfbf6be
9 changed files with 4 additions and 41 deletions
|
@ -558,8 +558,6 @@ int wpa_supplicant_init_eapol(struct wpa_supplicant *wpa_s)
|
|||
ctx->pkcs11_engine_path = wpa_s->conf->pkcs11_engine_path;
|
||||
ctx->pkcs11_module_path = wpa_s->conf->pkcs11_module_path;
|
||||
#endif /* EAP_TLS_OPENSSL */
|
||||
ctx->mac_addr = wpa_s->own_addr;
|
||||
ctx->uuid = wpa_s->conf->uuid;
|
||||
ctx->wps = wpa_s->wps;
|
||||
ctx->eap_param_needed = wpa_supplicant_eap_param_needed;
|
||||
ctx->cb = wpa_supplicant_eapol_cb;
|
||||
|
|
|
@ -197,6 +197,8 @@ int wpas_wps_init(struct wpa_supplicant *wpa_s)
|
|||
wps->dev.categ = WPS_DEV_COMPUTER;
|
||||
wps->dev.oui = WPS_DEV_OUI_WFA;
|
||||
wps->dev.sub_categ = WPS_DEV_COMPUTER_PC;
|
||||
os_memcpy(wps->dev.mac_addr, wpa_s->own_addr, ETH_ALEN);
|
||||
os_memcpy(wps->uuid, wpa_s->conf->uuid, 16);
|
||||
|
||||
wpa_s->wps = wps;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue