From c1466366c1b09fb6c77ffbc330255a4f33bf149c Mon Sep 17 00:00:00 2001 From: Helmut Schaa Date: Sat, 25 Jul 2009 17:25:51 +0200 Subject: [PATCH] --- yaml --- r: 159277 b: refs/heads/master c: 0ee9c13c7c92581ab005d80795cf65897213b249 h: refs/heads/master i: 159275: a2702a84f52180120a8381b83a11009bd5ff1e3e v: v3 --- [refs] | 2 +- trunk/net/mac80211/scan.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c0a0a47ce03e..dfb913e60236 100644 --- 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 index b376775e722f..147772a2977c 100644 --- 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