---

yaml --- r: 159247 b: refs/heads/master c: f502d09 h: refs/heads/master i: 159245: 4db0c05 159243: f9797f8 159239: 897279a 159231: 040bb7e v: v3
git-mirror · Jul 27, 2009 · 09cb940 · 09cb940
1 parent d25de13
commit 09cb940
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git 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
@@ -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);