Re: Switch to ap_scan = 1

[Robert Love <rml novell com>]

On Sun, 2006-02-05 at 18:54 -0500, Dan Williams wrote:

> I committed code to switch wpa_supplicant scanning from 2 -> 1 for most
> network cases.  This helps NM work better with Atheros cards.  I've been
> running this code for about a week with no discernible ill effects on
> ipw, airo, atmel, and atheros drivers.

Nice.  Thanks.

Per your ping on IRC:  Madwifi works for me, but only with the attached
patch to use the madwifi wpa_supplicant driver.

Non-broadcast networks do not work, though.  Not sure when they stopped
working.  The card simply fails to associate and times out.

	Robert Love

Index: src/nm-device-802-11-wireless.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-11-wireless.c,v
retrieving revision 1.33
diff -u -r1.33 nm-device-802-11-wireless.c
--- src/nm-device-802-11-wireless.c	31 Jan 2006 17:39:11 -0000	1.33
+++ src/nm-device-802-11-wireless.c	31 Jan 2006 19:32:20 -0000
@@ -2407,6 +2407,7 @@
 	const char *		iface = nm_device_get_iface (NM_DEVICE (self));
 	gboolean			success = FALSE;
 	int				tries = 0;
+	char *			driver = "wext";
 
 	/* Ensure our control socket directory is around */
 	mkdir (NM_WPA_CTRL_IFACE_DIR, S_IRWXU);
@@ -2414,9 +2415,12 @@
 	if (!(ctrl = wpa_ctrl_open (WPA_SUPPLICANT_GLOBAL_SOCKET, NM_WPA_CTRL_IFACE_DIR)))
 		goto exit;
 
+	if (!strcmp (nm_device_get_driver (NM_DEVICE (self)), "ath_pci"))
+		driver = "madwifi";
+
 	/* wpa_cli -g/var/run/wpa_supplicant-global interface_add eth1 "" wext /var/run/wpa_supplicant */
 	if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL,
-			"INTERFACE_ADD %s\t\twext\t" WPA_SUPPLICANT_CONTROL_SOCKET "\t", iface))
+			"INTERFACE_ADD %s\t\t%s\t" WPA_SUPPLICANT_CONTROL_SOCKET "\t", iface, driver))
 		goto exit;
 	wpa_ctrl_close (ctrl);