[pkg-wpa-devel] r1252 - in /wpasupplicant/trunk/debian: changelog patches/07_restore_scanreq_if_initassoc_failed.patch patches/08_only_use_cached_scan_results_if_nonempty.patch patches/series

Wed Sep 24 16:54:39 UTC 2008

Author: kelmo-guest
Date: Wed Sep 24 16:54:39 2008
New Revision: 1252

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1252
Log:
* Add two upstream patches to improve the retrieval of scan results from
  userspace:
   - 07_restore_scanreq_if_initassoc_failed.patch
   - 08_only_use_cached_scan_results_if_nonempty.patch

Added:
    wpasupplicant/trunk/debian/patches/07_restore_scanreq_if_initassoc_failed.patch
    wpasupplicant/trunk/debian/patches/08_only_use_cached_scan_results_if_nonempty.patch
Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/patches/series

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1252&op=diff
==============================================================================

--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Wed Sep 24 16:54:39 2008
@@ -24,8 +24,12 @@
     meny entry file:
      - 20_wpa_gui_menu_exec_path.patch
   * Install icon and menu entry for wpa_gui. [debian/rules] (Closes: #498923)
-
- -- Kel Modderman <kel at otaku42.de>  Thu, 25 Sep 2008 02:48:34 +1000
+  * Add two upstream patches to improve the retrieval of scan results from
+    userspace:
+     - 07_restore_scanreq_if_initassoc_failed.patch
+     - 08_only_use_cached_scan_results_if_nonempty.patch
+
+ -- Kel Modderman <kel at otaku42.de>  Thu, 25 Sep 2008 02:54:04 +1000
 
 wpasupplicant (0.6.4-2) unstable; urgency=low
 

Added: wpasupplicant/trunk/debian/patches/07_restore_scanreq_if_initassoc_failed.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/07_restore_scanreq_if_initassoc_failed.patch?rev=1252&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/07_restore_scanreq_if_initassoc_failed.patch (added)
+++ wpasupplicant/trunk/debian/patches/07_restore_scanreq_if_initassoc_failed.patch Wed Sep 24 16:54:39 2008
@@ -1,0 +1,25 @@
+From: Dan Nicholson <dbn.lists at gmail.com>
+Date: Wed, 24 Sep 2008 09:48:33 +0000 (+0300)
+Subject: Restore scan request settings if initial association failed
+X-Git-Url: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=2064c2f98515016c376f3b69bfe161c85639e764
+
+Restore scan request settings if initial association failed
+
+The scan path to initiate another scan if the initial association failed
+was broken due to wpa_s->scan_req being zeroed earlier in
+wpa_supplicant_scan(). This caused the second scan to bail out early
+since it thought this was not a requested scan.
+---
+
+diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
+index c2549e2..8767109 100644
+--- a/wpa_supplicant/scan.c
++++ b/wpa_supplicant/scan.c
+@@ -137,6 +137,7 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx)
+ 	if (wpa_s->scan_res_tried == 0 && wpa_s->conf->ap_scan == 1 &&
+ 	    !wpa_s->use_client_mlme) {
+ 		wpa_s->scan_res_tried++;
++		wpa_s->scan_req = scan_req;
+ 		wpa_printf(MSG_DEBUG, "Trying to get current scan results "
+ 			   "first without requesting a new scan to speed up "
+ 			   "initial association");

Added: wpasupplicant/trunk/debian/patches/08_only_use_cached_scan_results_if_nonempty.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/08_only_use_cached_scan_results_if_nonempty.patch?rev=1252&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/08_only_use_cached_scan_results_if_nonempty.patch (added)
+++ wpasupplicant/trunk/debian/patches/08_only_use_cached_scan_results_if_nonempty.patch Wed Sep 24 16:54:39 2008
@@ -1,0 +1,39 @@
+From: Dan Nicholson <dbn.lists at gmail.com>
+Date: Wed, 24 Sep 2008 09:51:08 +0000 (+0300)
+Subject: Don't post scan results when initial scan is emtpy
+X-Git-Url: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=23e072374ea500002b8beec5d0e87f9fc6a7609c
+
+Don't post scan results when initial scan is emtpy
+
+When the initial scan is made, just the cached results from the driver
+are used. If this is empty, it's useless to post the results since
+another scan is being scheduled immediately. This just causes extra
+processing from listeners for no gain.
+---
+
+diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
+index 0f9b338..04e3152 100644
+--- a/wpa_supplicant/events.c
++++ b/wpa_supplicant/events.c
+@@ -551,9 +551,18 @@ static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s)
+ 		goto req_scan;
+ 	}
+ 
+-	wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
+-
+-	wpa_supplicant_dbus_notify_scan_results(wpa_s);
++	/*
++	 * Don't post the results if this was the initial cached
++	 * and there were no results.
++	 */
++	if (wpa_s->scan_res_tried == 1 && wpa_s->conf->ap_scan == 1 &&
++	    wpa_s->scan_res->num == 0) {
++		wpa_msg(wpa_s, MSG_DEBUG, "Cached scan results are "
++			"empty - not posting");
++	} else {
++		wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
++		wpa_supplicant_dbus_notify_scan_results(wpa_s);
++	}
+ 
+ 	if (wpa_s->conf->ap_scan == 2 || wpa_s->disconnected)
+ 		return;

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1252&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Wed Sep 24 16:54:39 2008
@@ -4,6 +4,8 @@
 04_append_mmd_to_default_cflags.patch
 05_qmake_version_makefile.patch
 06_fix_segfault_32bit_compat_ioctls.patch
+07_restore_scanreq_if_initassoc_failed.patch
+08_only_use_cached_scan_results_if_nonempty.patch
 10_wpa_gui_icons.patch
 11_desktop_entry.patch
 12_wpa_gui_icons_resource.patch


