Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / net / mac80211 / scan.c

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 2c9b493af249c24888f5c66b8055eca95bb07b71..9270771702fe9a5a12fef9fcde4554f30b18b58d 100644 (file)
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -625,7 +625,7 @@ static void ieee80211_scan_state_resume(struct ieee80211_local *local,
        local->leave_oper_channel_time = jiffies;
 
        /* advance to the next channel to be scanned */
-       local->next_scan_state = SCAN_DECISION;
+       local->next_scan_state = SCAN_SET_CHANNEL;
 }
 
 void ieee80211_scan_work(struct work_struct *work)