diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-01 16:47:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-01 16:47:08 -0400 |
| commit | 54f5ffbf308828b588b9d1acd9a512d433be8a09 (patch) | |
| tree | 02746522e57bd0c92432a17d53ba40666cd41ced /net | |
| parent | 1d24fb3684f347226747c6b11ea426b7b992694e (diff) | |
| parent | de312db345f9770b64ff39ef5a7f86f6358e93cc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net')
| -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 33cd16901378..c70e17677135 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c | |||
| @@ -370,7 +370,7 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local) | |||
| 370 | */ | 370 | */ |
| 371 | drv_sw_scan_start(local); | 371 | drv_sw_scan_start(local); |
| 372 | 372 | ||
| 373 | local->leave_oper_channel_time = 0; | 373 | local->leave_oper_channel_time = jiffies; |
| 374 | local->next_scan_state = SCAN_DECISION; | 374 | local->next_scan_state = SCAN_DECISION; |
| 375 | local->scan_channel_idx = 0; | 375 | local->scan_channel_idx = 0; |
| 376 | 376 | ||