21c21
< #include "privsep_commands.h"
---
> #include "common/privsep_commands.h"
105c105,106
< static int wpa_driver_privsep_set_wpa(void *priv, int enabled)
---
> static int wpa_driver_privsep_scan(void *priv,
> struct wpa_driver_scan_params *params)
108,116c109,110
< wpa_printf(MSG_DEBUG, "%s: enabled=%d", __func__, enabled);
< return wpa_priv_cmd(drv, PRIVSEP_CMD_SET_WPA, &enabled,
< sizeof(enabled), NULL, NULL);
< }
<
<
< static int wpa_driver_privsep_scan(void *priv, const u8 *ssid, size_t ssid_len)
< {
< struct wpa_driver_privsep_data *drv = priv;
---
> const u8 *ssid = params->ssids[0].ssid;
> size_t ssid_len = params->ssids[0].ssid_len;
199,202c193,197
< static int wpa_driver_privsep_set_key(void *priv, wpa_alg alg, const u8 *addr,
< int key_idx, int set_tx,
< const u8 *seq, size_t seq_len,
< const u8 *key, size_t key_len)
---
> static int wpa_driver_privsep_set_key(const char *ifname, void *priv,
> enum wpa_alg alg, const u8 *addr,
> int key_idx, int set_tx,
> const u8 *seq, size_t seq_len,
> const u8 *key, size_t key_len)
329c324,325
< static void wpa_driver_privsep_event_assoc(void *ctx, wpa_event_type event,
---
> static void wpa_driver_privsep_event_assoc(void *ctx,
> enum wpa_event_type event,
441,442c437
<
< wpa_supplicant_rx_eapol(ctx, buf, buf + ETH_ALEN, len - ETH_ALEN);
---
> drv_event_eapol_rx(ctx, buf, buf + ETH_ALEN, len - ETH_ALEN);
446,461d440
< static void wpa_driver_privsep_event_sta_rx(void *ctx, u8 *buf, size_t len)
< {
< #ifdef CONFIG_CLIENT_MLME
< struct ieee80211_rx_status *rx_status;
<
< if (len < sizeof(*rx_status))
< return;
< rx_status = (struct ieee80211_rx_status *) buf;
< buf += sizeof(*rx_status);
< len -= sizeof(*rx_status);
<
< wpa_supplicant_sta_rx(ctx, buf, len, rx_status);
< #endif /* CONFIG_CLIENT_MLME */
< }
<
<
538,541d516
< case PRIVSEP_EVENT_STA_RX:
< wpa_driver_privsep_event_sta_rx(drv->ctx, event_buf,
< event_len);
< break;
750,758d724
< static int wpa_driver_privsep_set_mode(void *priv, int mode)
< {
< struct wpa_driver_privsep_data *drv = priv;
< wpa_printf(MSG_DEBUG, "%s mode=%d", __func__, mode);
< return wpa_priv_cmd(drv, PRIVSEP_CMD_SET_MODE, &mode, sizeof(mode),
< NULL, NULL);
< }
<
<
771,812c737,750
< wpa_driver_privsep_get_bssid,
< wpa_driver_privsep_get_ssid,
< wpa_driver_privsep_set_wpa,
< wpa_driver_privsep_set_key,
< wpa_driver_privsep_init,
< wpa_driver_privsep_deinit,
< wpa_driver_privsep_set_param,
< NULL /* set_countermeasures */,
< NULL /* set_drop_unencrypted */,
< wpa_driver_privsep_scan,
< NULL /* get_scan_results */,
< wpa_driver_privsep_deauthenticate,
< wpa_driver_privsep_disassociate,
< wpa_driver_privsep_associate,
< NULL /* set_auth_alg */,
< NULL /* add_pmkid */,
< NULL /* remove_pmkid */,
< NULL /* flush_pmkid */,
< wpa_driver_privsep_get_capa,
< NULL /* poll */,
< NULL /* get_ifname */,
< wpa_driver_privsep_get_mac_addr,
< NULL /* send_eapol */,
< NULL /* set_operstate */,
< NULL /* mlme_setprotection */,
< NULL /* get_hw_feature_data */,
< NULL /* set_channel */,
< NULL /* set_ssid */,
< NULL /* set_bssid */,
< NULL /* send_mlme */,
< NULL /* mlme_add_sta */,
< NULL /* mlme_remove_sta */,
< NULL /* update_ft_ies */,
< NULL /* send_ft_action */,
< wpa_driver_privsep_get_scan_results2,
< NULL /* set_probe_req_ie */,
< wpa_driver_privsep_set_mode,
< wpa_driver_privsep_set_country,
< NULL /* global_init */,
< NULL /* global_deinit */,
< NULL /* init2 */,
< NULL /* get_interfaces */
---
> .get_bssid = wpa_driver_privsep_get_bssid,
> .get_ssid = wpa_driver_privsep_get_ssid,
> .set_key = wpa_driver_privsep_set_key,
> .init = wpa_driver_privsep_init,
> .deinit = wpa_driver_privsep_deinit,
> .set_param = wpa_driver_privsep_set_param,
> .scan2 = wpa_driver_privsep_scan,
> .deauthenticate = wpa_driver_privsep_deauthenticate,
> .disassociate = wpa_driver_privsep_disassociate,
> .associate = wpa_driver_privsep_associate,
> .get_capa = wpa_driver_privsep_get_capa,
> .get_mac_addr = wpa_driver_privsep_get_mac_addr,
> .get_scan_results2 = wpa_driver_privsep_get_scan_results2,
> .set_country = wpa_driver_privsep_set_country,
816c754
< struct wpa_driver_ops *wpa_supplicant_drivers[] =
---
> struct wpa_driver_ops *wpa_drivers[] =