[BACK]Return to driver_bsd.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / dist / wpa / src / drivers

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/dist/wpa/src/drivers/Attic/driver_bsd.c between version 1.5 and 1.6

version 1.5, 2009/01/29 00:17:22 version 1.6, 2009/05/13 11:57:16
Line 430  wpa_driver_bsd_associate(void *priv, str
Line 430  wpa_driver_bsd_associate(void *priv, str
         /* XXX error handling is wrong but unclear what to do... */          /* 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)          if (wpa_driver_bsd_set_wpa_ie(drv, params->wpa_ie, params->wpa_ie_len) < 0)
                 return -1;                  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 &&          privacy = !(params->pairwise_suite == CIPHER_NONE &&
             params->group_suite == CIPHER_NONE &&              params->group_suite == CIPHER_NONE &&
Line 451  wpa_driver_bsd_associate(void *priv, str
Line 447  wpa_driver_bsd_associate(void *priv, str
   
         os_memset(&mlme, 0, sizeof(mlme));          os_memset(&mlme, 0, sizeof(mlme));
         mlme.im_op = IEEE80211_MLME_ASSOC;          mlme.im_op = IEEE80211_MLME_ASSOC;
 #ifdef NEW_FREEBSD_MLME_ASSOC  
         if (params->ssid != NULL)          if (params->ssid != NULL)
                 os_memcpy(mlme.im_ssid, params->ssid, params->ssid_len);                  os_memcpy(mlme.im_ssid, params->ssid, params->ssid_len);
         mlme.im_ssid_len = params->ssid_len;          mlme.im_ssid_len = params->ssid_len;
 #endif  
         if (params->bssid != NULL)          if (params->bssid != NULL)
                 os_memcpy(mlme.im_macaddr, params->bssid, IEEE80211_ADDR_LEN);                  os_memcpy(mlme.im_macaddr, params->bssid, IEEE80211_ADDR_LEN);
         if (set80211var(drv, IEEE80211_IOC_MLME, &mlme, sizeof(mlme)) < 0)          if (set80211var(drv, IEEE80211_IOC_MLME, &mlme, sizeof(mlme)) < 0)

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6

CVSweb <webmaster@jp.NetBSD.org>