From 09cb9400d61889c3648dd0d08d3513154155a93c Mon Sep 17 00:00:00 2001
From: Helmut Schaa <helmut.schaa@googlemail.com>
Date: Thu, 23 Jul 2009 12:13:48 +0200
Subject: [PATCH] --- yaml --- r: 159247 b: refs/heads/master c:
 f502d09b750437a4ec9c63333acf1070fe7958af h: refs/heads/master i:   159245:
 4db0c055d434c603634ac911e89a12e6cad54e61   159243:
 f9797f8131ec70bdf0eb537bbc3a5da4ada428d4   159239:
 897279a8eb2c96fb0a6f74e092f0ed5f5eef29a6   159231:
 040bb7e9e5a92a4884f52dc258ad097bfa8c6898 v: v3

---
 [refs]                    |  2 +-
 trunk/net/mac80211/scan.c | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 207411a05efa..44126606e621 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d3be3cc489176bc7bd23e673b0b4aef597af2b3
+refs/heads/master: f502d09b750437a4ec9c63333acf1070fe7958af
diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c
index 71500f1dddbc..db122e4e60e5 100644
--- a/trunk/net/mac80211/scan.c
+++ b/trunk/net/mac80211/scan.c
@@ -587,15 +587,21 @@ void ieee80211_scan_work(struct work_struct *work)
 		return;
 	}
 
-	switch (local->scan_state) {
-	case SCAN_SET_CHANNEL:
-		if (ieee80211_scan_state_set_channel(local, &next_delay))
-			return;
-		break;
-	case SCAN_SEND_PROBE:
-		ieee80211_scan_state_send_probe(local, &next_delay);
-		break;
-	}
+	/*
+	 * as long as no delay is required advance immediately
+	 * without scheduling a new work
+	 */
+	do {
+		switch (local->scan_state) {
+		case SCAN_SET_CHANNEL:
+			if (ieee80211_scan_state_set_channel(local, &next_delay))
+				return;
+			break;
+		case SCAN_SEND_PROBE:
+			ieee80211_scan_state_send_probe(local, &next_delay);
+			break;
+		}
+	} while (next_delay == 0);
 
 	queue_delayed_work(local->hw.workqueue, &local->scan_work,
 			   next_delay);