diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-01 22:47:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-01 22:47:08 +0200 |
| commit | 54f5ffbf308828b588b9d1acd9a512d433be8a09 (patch) | |
| tree | 02746522e57bd0c92432a17d53ba40666cd41ced /net | |
| parent | x86 bpf_jit: fix a bug in emitting the 16-bit immediate operand of AND (diff) | |
| parent | mac80211: fix oper channel timestamp updation (diff) | |
| download | linux-54f5ffbf308828b588b9d1acd9a512d433be8a09.tar.xz linux-54f5ffbf308828b588b9d1acd9a512d433be8a09.zip | |
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) */ drv_sw_scan_start(local); - local->leave_oper_channel_time = 0; + local->leave_oper_channel_time = jiffies; local->next_scan_state = SCAN_DECISION; local->scan_channel_idx = 0; |