Re: WPA on NetworkManager with MadWifi?

[Robert Love <rml novell com>]

On Tue, 2006-01-31 at 22:51 -0500, Darren Albers wrote:

> Thank you!  I will do that.

I additionally need the attached patch to get madwifi to work with WPA.

	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);
 
@@ -2462,9 +2466,9 @@
 	ctrl = self->priv->sup_ctrl;
 	g_assert (ctrl);
 
-	/* Tell wpa_supplicant that we'll do the scanning */
+	/* Have wpa_supplicant also scan.  Makes some drivers (madwifi) work better. */
 	if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL,
-			"AP_SCAN 2"))
+			"AP_SCAN 1"))
 		goto out;
 
 	/* Standard network setup info */