colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc. cleanup

Browse Source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1556 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love
2006-03-06 15:03:41 +00:00
parent a5919b696c
commit cc8a193b8e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nm-device-802-11-wireless.c
View File

@@ -2590,8 +2590,8 @@ supplicant_send_network_config (NMDevice80211Wireless *self,
const char * essid; const char * essid;
struct wpa_ctrl * ctrl; struct wpa_ctrl * ctrl;
gboolean user_created; gboolean user_created;
char * hex_essid; const char * hex_essid;
char * ap_scan = "AP_SCAN 1"; const char * ap_scan = "AP_SCAN 1";
guint32 caps; guint32 caps;
gboolean supports_wpa; gboolean supports_wpa;
@@ -2612,14 +2612,16 @@ supplicant_send_network_config (NMDevice80211Wireless *self,
supports_wpa = (caps & NM_802_11_CAP_PROTO_WPA) supports_wpa = (caps & NM_802_11_CAP_PROTO_WPA)
|| (caps & NM_802_11_CAP_PROTO_WPA2); || (caps & NM_802_11_CAP_PROTO_WPA2);
/* Ad-Hoc and non-broadcasting networks need AP_SCAN 2 */ /* Use "AP_SCAN 2" if:
* - The wireless network is non-broadcast or user created
* - The wireless driver does not support WPA
*/
user_created = nm_ap_get_user_created (ap); user_created = nm_ap_get_user_created (ap);
if (!nm_ap_get_broadcast (ap) || user_created || !supports_wpa) if (!nm_ap_get_broadcast (ap) || user_created || !supports_wpa)
ap_scan = "AP_SCAN 2"; ap_scan = "AP_SCAN 2";
/* Tell wpa_supplicant that we'll do the scanning */ /* Tell wpa_supplicant that we'll do the scanning */
if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, ap_scan))
ap_scan))
goto out; goto out;
/* Standard network setup info */ /* Standard network setup info */