projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-v3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
net
/
mac80211
/
scan.c
diff --git
a/net/mac80211/scan.c
b/net/mac80211/scan.c
index
33cd169
..
c70e176
100644
(file)
--- 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);
*/
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;
local->next_scan_state = SCAN_DECISION;
local->scan_channel_idx = 0;