blob: 8798f534ecda9593244d3544c61e5bb4101c072f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
--- a/net80211/ieee80211_scan_ap.c
+++ b/net80211/ieee80211_scan_ap.c
@@ -595,6 +595,14 @@ ap_end(struct ieee80211_scan_state *ss,
ic = vap->iv_ic;
+ /* if we're already running, switch back to the home channel */
+ if ((vap->iv_state == IEEE80211_S_RUN) &&
+ (ic->ic_bsschan != IEEE80211_CHAN_ANYC)) {
+ ic->ic_curchan = ic->ic_bsschan;
+ ic->ic_set_channel(ic);
+ goto out;
+ }
+
/* record stats for the channel that was scanned last */
ic->ic_set_channel(ic);
spin_lock_irqsave(&channel_lock, sflags);
@@ -648,6 +656,8 @@ ap_end(struct ieee80211_scan_state *ss,
IEEE80211_SCHEDULE_TQUEUE(&as->as_actiontq);
res = 1;
}
+
+out:
SCAN_AP_UNLOCK_IRQ(as);
return res;
}
|
