summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-04-01 16:47:08 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-01 16:47:08 -0400
commit54f5ffbf308828b588b9d1acd9a512d433be8a09 (patch)
tree02746522e57bd0c92432a17d53ba40666cd41ced /net
parent1d24fb3684f347226747c6b11ea426b7b992694e (diff)
parentde312db345f9770b64ff39ef5a7f86f6358e93cc (diff)
downloadlinux-54f5ffbf308828b588b9d1acd9a512d433be8a09.tar.bz2
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.c2
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;