aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2009-05-29 19:41:43 (GMT)
committerJouni Malinen <j@w1.fi>2009-11-22 18:15:30 (GMT)
commitc01609d10e3e4206f269a64d1a5905737885d774 (patch)
tree77d134c461675ed5a38a6611837b550cbf997954
parent85accf1d2a5b7b9baa5bd5830dff3621b2a2a0c8 (diff)
downloadhostap-06-c01609d10e3e4206f269a64d1a5905737885d774.zip
hostap-06-c01609d10e3e4206f269a64d1a5905737885d774.tar.gz
hostap-06-c01609d10e3e4206f269a64d1a5905737885d774.tar.bz2
driver_bsd.c: Use new MLME method of association.
Old way does not work with all drivers on NetBSD and FreeBSD are also using this so should be a safe change. [Bug 312] Signed-off-by: Roy Marples <roy@marples.name> (cherry picked from commit a5b73cc49d0b80ab388618b99ac8210f329daa8e)
-rw-r--r--src/drivers/driver_bsd.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/drivers/driver_bsd.c b/src/drivers/driver_bsd.c
index 6df3612..218d913 100644
--- a/src/drivers/driver_bsd.c
+++ b/src/drivers/driver_bsd.c
@@ -386,10 +386,6 @@ wpa_driver_bsd_associate(void *priv, struct wpa_driver_associate_params *params)
/* XXX error handling is wrong but unclear what to do... */
if (wpa_driver_bsd_set_wpa_ie(drv, params->wpa_ie, params->wpa_ie_len) < 0)
return -1;
-#ifndef NEW_FREEBSD_MLME_ASSOC
- if (wpa_driver_bsd_set_ssid(drv, params->ssid, params->ssid_len) < 0)
- return -1;
-#endif
privacy = !(params->pairwise_suite == CIPHER_NONE &&
params->group_suite == CIPHER_NONE &&
@@ -407,11 +403,9 @@ wpa_driver_bsd_associate(void *priv, struct wpa_driver_associate_params *params)
os_memset(&mlme, 0, sizeof(mlme));
mlme.im_op = IEEE80211_MLME_ASSOC;
-#ifdef NEW_FREEBSD_MLME_ASSOC
if (params->ssid != NULL)
os_memcpy(mlme.im_ssid, params->ssid, params->ssid_len);
mlme.im_ssid_len = params->ssid_len;
-#endif
if (params->bssid != NULL)
os_memcpy(mlme.im_macaddr, params->bssid, IEEE80211_ADDR_LEN);
if (set80211var(drv, IEEE80211_IOC_MLME, &mlme, sizeof(mlme)) < 0)