Page MenuHomeFreeBSD

D5140.id12884.diff
No OneTemporary

D5140.id12884.diff

Index: sys/net80211/ieee80211_scan_sw.c
===================================================================
--- sys/net80211/ieee80211_scan_sw.c
+++ sys/net80211/ieee80211_scan_sw.c
@@ -598,7 +598,7 @@
struct ieee80211vap *vap = ss->ss_vap;
struct ieee80211com *ic = ss->ss_ic;
struct ieee80211_channel *chan;
- unsigned long maxdwell, scanend;
+ unsigned long maxdwell;
int scandone = 0;
IEEE80211_LOCK(ic);
@@ -632,7 +632,7 @@
}
}
- scanend = ticks + ss_priv->ss_duration;
+ ss_priv->ss_scanend = ticks + ss_priv->ss_duration;
/* XXX scan state can change! Re-validate scan state! */
@@ -652,7 +652,7 @@
if (scandone || (ss->ss_flags & IEEE80211_SCAN_GOTPICK) ||
(ss_priv->ss_iflags & ISCAN_ABORT) ||
- time_after(ticks + ss->ss_mindwell, scanend))
+ time_after(ticks + ss->ss_mindwell, ss_priv->ss_scanend))
break;
chan = ss->ss_chans[ss->ss_next++];
@@ -660,8 +660,8 @@
/*
* Watch for truncation due to the scan end time.
*/
- if (time_after(ticks + ss->ss_maxdwell, scanend))
- maxdwell = scanend - ticks;
+ if (time_after(ticks + ss->ss_maxdwell, ss_priv->ss_scanend))
+ maxdwell = ss_priv->ss_scanend - ticks;
else
maxdwell = ss->ss_maxdwell;
@@ -772,12 +772,12 @@
if ((ss_priv->ss_iflags & ISCAN_CANCEL) == 0 &&
!ss->ss_ops->scan_end(ss, vap) &&
(ss->ss_flags & IEEE80211_SCAN_ONCE) == 0 &&
- time_before(ticks + ss->ss_mindwell, scanend)) {
+ time_before(ticks + ss->ss_mindwell, ss_priv->ss_scanend)) {
IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
"%s: done, restart "
"[ticks %u, dwell min %lu scanend %lu]\n",
__func__,
- ticks, ss->ss_mindwell, scanend);
+ ticks, ss->ss_mindwell, ss_priv->ss_scanend);
ss->ss_next = 0; /* reset to begining */
if (ss->ss_flags & IEEE80211_SCAN_ACTIVE)
vap->iv_stats.is_scan_active++;
@@ -797,7 +797,7 @@
IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
"%s: %s, [ticks %u, dwell min %lu scanend %lu]\n",
__func__, scandone ? "done" : "stopped",
- ticks, ss->ss_mindwell, scanend);
+ ticks, ss->ss_mindwell, ss_priv->ss_scanend);
/*
* Since a cancellation may have occured during one of the
@@ -836,6 +836,7 @@
}
}
ss_priv->ss_iflags &= ~(ISCAN_CANCEL|ISCAN_ABORT);
+ ss_priv->ss_scanend = 0;
ss->ss_flags &= ~(IEEE80211_SCAN_ONCE | IEEE80211_SCAN_PICK1ST);
IEEE80211_UNLOCK(ic);
#undef ISCAN_REP

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 18, 1:22 AM (6 m, 5 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23855020
Default Alt Text
D5140.id12884.diff (2 KB)

Event Timeline