From 8929edf7a2cf2366eca3466be54dced6fa8925e0 Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Tue, 25 Sep 2007 20:43:59 +0000
Subject: [PATCH] - Always allow explicit wireless scans triggered from a
 control interface

---
 wpa_supplicant-0.5.7-always-scan.patch | 12 ++++++++++++
 wpa_supplicant.spec                    |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 wpa_supplicant-0.5.7-always-scan.patch

diff --git a/wpa_supplicant-0.5.7-always-scan.patch b/wpa_supplicant-0.5.7-always-scan.patch
new file mode 100644
index 0000000..25afd07
--- /dev/null
+++ b/wpa_supplicant-0.5.7-always-scan.patch
@@ -0,0 +1,12 @@
+diff -up wpa_supplicant-0.5.7/wpa_supplicant.c.always-scan wpa_supplicant-0.5.7/wpa_supplicant.c
+--- wpa_supplicant-0.5.7/wpa_supplicant.c.always-scan	2007-09-25 15:51:35.000000000 -0400
++++ wpa_supplicant-0.5.7/wpa_supplicant.c	2007-09-25 16:31:27.000000000 -0400
+@@ -972,7 +972,7 @@ static void wpa_supplicant_scan(void *el
+ 	struct wpa_ssid *ssid;
+ 	int enabled, scan_req = 0, ret;
+ 
+-	if (wpa_s->disconnected)
++	if (wpa_s->disconnected && !wpa_s->scan_req)
+ 		return;
+ 
+ 	enabled = 0;
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index 3808b60..abd9a26 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.5.7
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -21,6 +21,7 @@ Patch4: wpa_supplicant-0.5.7-debug-file.patch
 Patch5: wpa_supplicant-0.5.7-qmake-location.patch
 Patch6: wpa_supplicant-0.5.7-flush-debug-output.patch
 Patch7: wpa_supplicant-0.5.7-sigusr1-changes-debuglevel.patch
+Patch8: wpa_supplicant-0.5.7-always-scan.patch
 URL: http://w1.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,6 +56,7 @@ Graphical User Interface for wpa_supplicant written using QT3
 %patch5 -p1 -b .qmake-location
 %patch6 -p1 -b .flush-debug-output
 %patch7 -p1 -b .sigusr1-changes-debuglevel
+%patch8 -p1 -b .always-scan
 
 %build
 cp %{SOURCE1} ./.config
@@ -140,6 +142,9 @@ fi
 %{_bindir}/wpa_gui
 
 %changelog
+* Tue Sep 25 2007 Dan Williams <dcbw@redhat.com> - 0.5.7-9
+- Always allow explicit wireless scans triggered from a control interface
+
 * Thu Sep 20 2007 Dan Williams <dcbw@redhat.com> - 0.5.7-8
 - Change system bus activation file name to work around D-Bus bug that fails
     to launch services unless their .service file is named the same as the