From cc8a193b8e08be098990c96f007bacce58b6f8da Mon Sep 17 00:00:00 2001 From: Robert Love Date: Mon, 6 Mar 2006 15:03:41 +0000 Subject: [PATCH] Misc. cleanup git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1556 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- src/nm-device-802-11-wireless.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index 6411ac1c3..a0b7d8327 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -2590,8 +2590,8 @@ supplicant_send_network_config (NMDevice80211Wireless *self, const char * essid; struct wpa_ctrl * ctrl; gboolean user_created; - char * hex_essid; - char * ap_scan = "AP_SCAN 1"; + const char * hex_essid; + const char * ap_scan = "AP_SCAN 1"; guint32 caps; gboolean supports_wpa; @@ -2612,14 +2612,16 @@ supplicant_send_network_config (NMDevice80211Wireless *self, supports_wpa = (caps & NM_802_11_CAP_PROTO_WPA) || (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); if (!nm_ap_get_broadcast (ap) || user_created || !supports_wpa) ap_scan = "AP_SCAN 2"; /* Tell wpa_supplicant that we'll do the scanning */ - if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, - ap_scan)) + if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, ap_scan)) goto out; /* Standard network setup info */