Package: network-manager
Version: 0.6.6-1

See
https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/211780
for more details.  Oddly enough the patch _was_ in ubuntu though it's
actually my Debian desktop I need it for!

diff attached.

Adrian
-- 
Email: [EMAIL PROTECTED]  -*-  GPG key available on public key servers
Debian GNU/Linux - the maintainable distribution   -*-  www.debian.org
--- network-manager-0.6.6.orig/src/nm-device-802-11-wireless.c
+++ network-manager-0.6.6/src/nm-device-802-11-wireless.c
@@ -2662,6 +2662,8 @@
 	const char *			iface;
 	gboolean				ask_user = FALSE;
 	GMainContext *ctx;
+	const char *		wpa_driver;
+	const char *		kernel_driver;
 
 	g_assert (ap);
 
@@ -2695,7 +2697,15 @@
 		nm_warning ("Activation (%s/wireless): couldn't start the supplicant.", iface);
 		goto out;
 	}
-	if (!nm_supplicant_interface_init (self->priv->supplicant, iface, "wext"))
+	/* some kernel drivers require specific wpa_supplicant drivers */
+	kernel_driver = nm_device_get_driver (NM_DEVICE (self));
+	wpa_driver = "wext";
+	if (!strcmp (kernel_driver, "hostap_pci") ||
+            !strcmp (kernel_driver, "hostap_cs") ||
+            !strcmp (kernel_driver, "hostap_plx"))
+          wpa_driver = "hostap";
+	
+	if (!nm_supplicant_interface_init (self->priv->supplicant, iface, wpa_driver))
 	{
 		nm_warning ("Activation (%s/wireless): couldn't connect to the supplicant.", iface);
 		goto out;

Reply via email to