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

privsep: Fix compilation due to associate() parameter updates

Browse source 
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>
This commit is contained in:
Jouni Malinen 2014-12-24 20:10:23 +02:00
parent eae3df7ee4
commit 36f0cf3774
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/privsep_commands.h
View file

@ -31,7 +31,9 @@ struct privsep_cmd_associate
u8 bssid[ETH_ALEN]; u8 bssid[ETH_ALEN];
u8 ssid[32]; u8 ssid[32];
size_t ssid_len; size_t ssid_len;
int hwmode;
int freq; int freq;
int channel;
int pairwise_suite; int pairwise_suite;
int group_suite; int group_suite;
int key_mgmt_suite; int key_mgmt_suite;

6
src/drivers/driver_privsep.c
View file

@ -228,7 +228,7 @@ static int wpa_driver_privsep_associate(
wpa_printf(MSG_DEBUG, "%s: priv=%p freq=%d pairwise_suite=%d " wpa_printf(MSG_DEBUG, "%s: priv=%p freq=%d pairwise_suite=%d "
"group_suite=%d key_mgmt_suite=%d auth_alg=%d mode=%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->group_suite, params->key_mgmt_suite,
params->auth_alg, params->mode); 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->bssid, params->bssid, ETH_ALEN);
os_memcpy(data->ssid, params->ssid, params->ssid_len); os_memcpy(data->ssid, params->ssid, params->ssid_len);
data->ssid_len = 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->pairwise_suite = params->pairwise_suite;
data->group_suite = params->group_suite; data->group_suite = params->group_suite;
data->key_mgmt_suite = params->key_mgmt_suite; data->key_mgmt_suite = params->key_mgmt_suite;

4
wpa_supplicant/wpa_priv.c
View file

@ -202,7 +202,9 @@ static void wpa_priv_cmd_associate(struct wpa_priv_interface *iface,
if (assoc->ssid_len > 32) if (assoc->ssid_len > 32)
return; return;
params.ssid_len = assoc->ssid_len; 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) { if (assoc->wpa_ie_len) {
params.wpa_ie = (u8 *) (assoc + 1); params.wpa_ie = (u8 *) (assoc + 1);
params.wpa_ie_len = assoc->wpa_ie_len; params.wpa_ie_len = assoc->wpa_ie_len;