Module Name: src
Committed By: bouyer
Date: Mon May 18 20:17:22 UTC 2009
Modified Files:
src/dist/wpa/src/drivers [netbsd-5]: driver_bsd.c
Log Message:
Pull up following revision(s) (requested by roy in ticket #755):
dist/wpa/src/drivers/driver_bsd.c: revision 1.6
Use new way of associating, which fixes wpa with ral(4)
To generate a diff of this commit:
cvs rdiff -u -r1.2.4.3 -r1.2.4.4 src/dist/wpa/src/drivers/driver_bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/wpa/src/drivers/driver_bsd.c
diff -u src/dist/wpa/src/drivers/driver_bsd.c:1.2.4.3 src/dist/wpa/src/drivers/driver_bsd.c:1.2.4.4
--- src/dist/wpa/src/drivers/driver_bsd.c:1.2.4.3 Mon Feb 2 20:29:37 2009
+++ src/dist/wpa/src/drivers/driver_bsd.c Mon May 18 20:17:22 2009
@@ -430,10 +430,6 @@
/* 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 &&
@@ -451,11 +447,9 @@
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)
