---

yaml --- r: 159277 b: refs/heads/master c: 0ee9c13 h: refs/heads/master i: 159275: a2702a8 v: v3
git-mirror · Jul 29, 2009 · c146636 · c146636
1 parent e67b3e2
commit c146636
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0b2bbd833a5a26b5a9425cb9a7eb66bbe736dd1
+refs/heads/master: 0ee9c13c7c92581ab005d80795cf65897213b249
diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c
@@ -605,8 +605,11 @@ static void ieee80211_scan_state_set_channel(struct ieee80211_local *local,
 	/* advance state machine to next channel/band */
 	local->scan_channel_idx++;
 
-	if (skip)
+	if (skip) {
+		/* if we skip this channel return to the decision state */
+		local->next_scan_state = SCAN_DECISION;
 		return;
+	}
 
 	/*
 	 * Probe delay is used to update the NAV, cf. 11.1.3.2.2