diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2024-07-21 13:14:24 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2024-07-21 13:14:24 +0000 |
| commit | 950d2f43375b87e95ebc0ecda9b281b84b2213d7 (patch) | |
| tree | e5c37bef0e53ac309e9c1f0c7859da6098a18f0a /wpa_supplicant/wpa_priv.c | |
| parent | df0c787c3ece1d65fd6fef34aa8f56da557b5ac0 (diff) | |
wpa: Import wpa 2.11vendor/wpa/2.11
Diffstat (limited to 'wpa_supplicant/wpa_priv.c')
| -rw-r--r-- | wpa_supplicant/wpa_priv.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/wpa_supplicant/wpa_priv.c b/wpa_supplicant/wpa_priv.c index c5d7168690f7..88f3f2a52356 100644 --- a/wpa_supplicant/wpa_priv.c +++ b/wpa_supplicant/wpa_priv.c @@ -187,7 +187,10 @@ static void wpa_priv_get_scan_results2(struct wpa_priv_interface *iface, int val; size_t i; - res = iface->driver->get_scan_results2(iface->drv_priv); + if (iface->driver->get_scan_results) + res = iface->driver->get_scan_results(iface->drv_priv, NULL); + else + res = iface->driver->get_scan_results2(iface->drv_priv); if (res == NULL) goto fail; @@ -231,7 +234,7 @@ static void wpa_priv_cmd_get_scan_results(struct wpa_priv_interface *iface, if (iface->drv_priv == NULL) return; - if (iface->driver->get_scan_results2) + if (iface->driver->get_scan_results || iface->driver->get_scan_results2) wpa_priv_get_scan_results2(iface, from, fromlen); else sendto(iface->fd, "", 0, 0, (struct sockaddr *) from, fromlen); @@ -414,6 +417,7 @@ static void wpa_priv_cmd_set_key(struct wpa_priv_interface *iface, p.key = params->key_len ? params->key : NULL; p.key_len = params->key_len; p.key_flag = params->key_flag; + p.link_id = -1; res = iface->driver->set_key(iface->drv_priv, &p); wpa_printf(MSG_DEBUG, "drv->set_key: res=%d", res); @@ -1134,7 +1138,8 @@ void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event, void wpa_supplicant_rx_eapol(void *ctx, const u8 *src_addr, - const u8 *buf, size_t len) + const u8 *buf, size_t len, + enum frame_encryption encrypted) { struct wpa_priv_interface *iface = ctx; struct msghdr msg; |