diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-01-05 10:12:45 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-05 10:13:24 -0500 |
| commit | 1032c736e81cdf490ae62f86da7efe67c3c3e61d (patch) | |
| tree | a0c3919849f97dbbc5ea7c6a9ac1d7a639e44a73 /net/mac80211/scan.c | |
| parent | 117ff42fd43e92d24c6aa6f3e4f0f1e1edada140 (diff) | |
| parent | cb00ec382b57d35b955c085198cd54a0c1fcdc94 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/b43legacy/dma.c
Diffstat (limited to 'net/mac80211/scan.c')
| -rw-r--r-- | net/mac80211/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 2c9b493af249..9270771702fe 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c | |||
| @@ -625,7 +625,7 @@ static void ieee80211_scan_state_resume(struct ieee80211_local *local, | |||
| 625 | local->leave_oper_channel_time = jiffies; | 625 | local->leave_oper_channel_time = jiffies; |
| 626 | 626 | ||
| 627 | /* advance to the next channel to be scanned */ | 627 | /* advance to the next channel to be scanned */ |
| 628 | local->next_scan_state = SCAN_DECISION; | 628 | local->next_scan_state = SCAN_SET_CHANNEL; |
| 629 | } | 629 | } |
| 630 | 630 | ||
| 631 | void ieee80211_scan_work(struct work_struct *work) | 631 | void ieee80211_scan_work(struct work_struct *work) |