privsep: Fix compilation due to associate() parameter updates

struct wpa_driver_associate_params moved to using struct
hostapd_freq_params instead of just frequency. Need to update wpa_priv
to do same.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/src/common/privsep_commands.h b/src/common/privsep_commands.h
index 858b51d..4dc34c4 100644 (file)
--- a/src/common/privsep_commands.h
+++ b/src/common/privsep_commands.h
@@ -31,7 +31,9 @@ struct privsep_cmd_associate
        u8 bssid[ETH_ALEN];
        u8 ssid[32];
        size_t ssid_len;
+       int hwmode;
        int freq;
+       int channel;
        int pairwise_suite;
        int group_suite;
        int key_mgmt_suite;

diff --git a/src/drivers/driver_privsep.c b/src/drivers/driver_privsep.c
index ed88e71..a677ad6 100644 (file)
--- a/src/drivers/driver_privsep.c
+++ b/src/drivers/driver_privsep.c
@@ -228,7 +228,7 @@ static int wpa_driver_privsep_associate(
 
        wpa_printf(MSG_DEBUG, "%s: priv=%p freq=%d pairwise_suite=%d "
                   "group_suite=%d key_mgmt_suite=%d auth_alg=%d mode=%d",
-                  __func__, priv, params->freq, params->pairwise_suite,
+                  __func__, priv, params->freq.freq, params->pairwise_suite,
                   params->group_suite, params->key_mgmt_suite,
                   params->auth_alg, params->mode);
 
@@ -241,7 +241,9 @@ static int wpa_driver_privsep_associate(
                os_memcpy(data->bssid, params->bssid, ETH_ALEN);
        os_memcpy(data->ssid, params->ssid, params->ssid_len);
        data->ssid_len = params->ssid_len;
-       data->freq = params->freq;
+       data->hwmode = params->freq.mode;
+       data->freq = params->freq.freq;
+       data->channel = params->freq.channel;
        data->pairwise_suite = params->pairwise_suite;
        data->group_suite = params->group_suite;
        data->key_mgmt_suite = params->key_mgmt_suite;

diff --git a/wpa_supplicant/wpa_priv.c b/wpa_supplicant/wpa_priv.c
index 5426177..193ea6c 100644 (file)
--- a/wpa_supplicant/wpa_priv.c
+++ b/wpa_supplicant/wpa_priv.c
@@ -202,7 +202,9 @@ static void wpa_priv_cmd_associate(struct wpa_priv_interface *iface,
        if (assoc->ssid_len > 32)
                return;
        params.ssid_len = assoc->ssid_len;
-       params.freq = assoc->freq;
+       params.freq.mode = assoc->hwmode;
+       params.freq.freq = assoc->freq;
+       params.freq.channel = assoc->channel;
        if (assoc->wpa_ie_len) {
                params.wpa_ie = (u8 *) (assoc + 1);
                params.wpa_ie_len = assoc->wpa_ie_len;