NetworkManager r3717 - in branches/NETWORKMANAGER_0_6_0_RELEASE: . src

[dcbw svn gnome org]

Author: dcbw
Date: Wed Jun  4 18:55:00 2008
New Revision: 3717
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3717&view=rev

Log:
2008-06-04  Dan Williams  <dcbw redhat com>

	* src/nm-device-802-11-wireless.c
		- (supplicant_send_network_config): always send scan_ssid=1 for
			infrastructure networks; drivers will ignore it if they
			don't support it



Modified:
   branches/NETWORKMANAGER_0_6_0_RELEASE/ChangeLog
   branches/NETWORKMANAGER_0_6_0_RELEASE/src/nm-device-802-11-wireless.c

Modified: branches/NETWORKMANAGER_0_6_0_RELEASE/src/nm-device-802-11-wireless.c
==============================================================================
--- branches/NETWORKMANAGER_0_6_0_RELEASE/src/nm-device-802-11-wireless.c	(original)
+++ branches/NETWORKMANAGER_0_6_0_RELEASE/src/nm-device-802-11-wireless.c	Wed Jun  4 18:55:00 2008
@@ -2466,16 +2466,6 @@
 			"SET_NETWORK %i ssid %s", nwid, hex_essid))
 		goto out;
 
-	/* For non-broadcast networks, we need to set "scan_ssid 1" to scan with probe request frames.
-	 * However, don't try to probe Ad-Hoc networks.
-	 */
-	if (!nm_ap_get_broadcast (ap) && !is_adhoc)
-	{
-		if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL,
-				"SET_NETWORK %i scan_ssid 1", nwid))
-			goto out;
-	}
-
 	/* Ad-Hoc ? */
 	if (is_adhoc) {
 		guint32 adhoc_freq = nm_ap_get_freq (ap);
@@ -2495,6 +2485,13 @@
 		                                        "SET_NETWORK %i frequency %d",
 		                                        nwid, adhoc_freq);
 	}
+	else
+	{
+		/* Request that APs be probe-scanned when possible */
+		if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL,
+				"SET_NETWORK %i scan_ssid 1", nwid))
+			goto out;
+	}
 
 	if (nm_device_activation_should_cancel (NM_DEVICE (self)))
 		goto out;