diff --git a/[refs] b/[refs] index 93b753fb4ac2..afd8aeac324e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4d6367fa77fb604ce62582e1c0998e0ed098927 +refs/heads/master: de312db345f9770b64ff39ef5a7f86f6358e93cc diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c index 33cd16901378..c70e17677135 100644 --- a/trunk/net/mac80211/scan.c +++ b/trunk/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;