From d455e80fd8a8bb94692522915320466cc64046df Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Feb 06 2009 21:35:16 +0000
Subject: - Ensure that drivers don't retry association when they aren't supposed to


---

diff --git a/wpa-supplicant-0.6.7-really-disassoc.patch b/wpa-supplicant-0.6.7-really-disassoc.patch
new file mode 100644
index 0000000..982c60a
--- /dev/null
+++ b/wpa-supplicant-0.6.7-really-disassoc.patch
@@ -0,0 +1,31 @@
+diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c
+index 631c63d..fb9d5c6 100644
+--- a/src/drivers/driver_wext.c
++++ b/src/drivers/driver_wext.c
+@@ -1911,9 +1911,24 @@ static int wpa_driver_wext_disassociate(void *priv, const u8 *addr,
+ 					int reason_code)
+ {
+ 	struct wpa_driver_wext_data *drv = priv;
++	u8 ssid[32];
++	int ret;
++
+ 	wpa_printf(MSG_DEBUG, "%s", __FUNCTION__);
+-	return wpa_driver_wext_mlme(drv, addr, IW_MLME_DISASSOC,
+-				    reason_code);
++
++	ret = wpa_driver_wext_mlme(drv, addr, IW_MLME_DISASSOC,
++	                           reason_code);
++	if (ret == 0) {
++		const u8 null_bssid[ETH_ALEN] = { 0, 0, 0, 0, 0, 0 };
++
++		ret = wpa_driver_wext_set_bssid(drv, null_bssid);
++
++		for (ret = 0; ret < 32; ret++)
++			ssid[ret] = rand() & 0xFF;
++		ret = wpa_driver_wext_set_ssid(drv, ssid, 32);
++	}
++
++	return ret;
+ }
+ 
+ 
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index 731d64f..e8bb129 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -2,7 +2,7 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.6.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -18,6 +18,7 @@ Patch2: wpa_supplicant-0.5.7-flush-debug-output.patch
 Patch3: wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch
 Patch4: wpa_supplicant-0.5.10-dbus-service-file.patch
 Patch5: wpa_supplicant-0.6.7-quiet-scan-results-message.patch
+Patch6: wpa-supplicant-0.6.7-really-disassoc.patch
 
 URL: http://w1.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +52,7 @@ Graphical User Interface for wpa_supplicant written using QT3
 %patch3 -p1 -b .use-IW_ENCODE_TEMP
 %patch4 -p1 -b .dbus-service-file
 %patch5 -p1 -b .quiet-scan-results-msg
+%patch6 -p1 -b .really-disassociate
 
 %build
 pushd wpa_supplicant
@@ -141,6 +143,9 @@ fi
 %{_bindir}/wpa_gui
 
 %changelog
+* Fri Feb  6 2009 Dan Williams <dcbw@redhat.com> - 1:0.6.7-2
+- Ensure that drivers don't retry association when they aren't supposed to
+
 * Fri Jan 30 2009 Dan Williams <dcbw@redhat.com> - 1:0.6.7-1
 - Fix PEAP connections to Windows Server 2008 authenticators (rh #465022)
 - Stop supplicant on uninstall (rh #447843)