diff options
author | adrian <adrian@FreeBSD.org> | 2016-03-30 00:44:10 +0000 |
---|---|---|
committer | adrian <adrian@FreeBSD.org> | 2016-03-30 00:44:10 +0000 |
commit | 8857d6b6f71c57c84a1b3588670efd909ebda3fd (patch) | |
tree | df65cb26e2548cb616b101e51279c3d1ae57af32 /sys/net80211/ieee80211_scan_sta.c | |
parent | 3a0c4470c1c4f89fc371e10ec6ec110856c5e320 (diff) | |
download | FreeBSD-src-8857d6b6f71c57c84a1b3588670efd909ebda3fd.zip FreeBSD-src-8857d6b6f71c57c84a1b3588670efd909ebda3fd.tar.gz |
[net80211] migrate the time_* macros to ieee80211_* namespace.
It turns out that these will clash very annoyingly with the linux
macros in the linuxkpi layer, so let the wookie^Wlinux win.
The only user that I can find is ath(4), so fix it there too.
Diffstat (limited to 'sys/net80211/ieee80211_scan_sta.c')
-rw-r--r-- | sys/net80211/ieee80211_scan_sta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_scan_sta.c b/sys/net80211/ieee80211_scan_sta.c index 07df92f..233c436 100644 --- a/sys/net80211/ieee80211_scan_sta.c +++ b/sys/net80211/ieee80211_scan_sta.c @@ -1323,7 +1323,7 @@ sta_roam_check(struct ieee80211_scan_state *ss, struct ieee80211vap *vap) * XXX deauth current ap */ if (curRate < roamRate || curRssi < roamRssi) { - if (time_after(ticks, ic->ic_lastscan + vap->iv_scanvalid)) { + if (ieee80211_time_after(ticks, ic->ic_lastscan + vap->iv_scanvalid)) { /* * Scan cache contents are too old; force a scan now * if possible so we have current state to make a @@ -1333,7 +1333,7 @@ sta_roam_check(struct ieee80211_scan_state *ss, struct ieee80211vap *vap) * XXX force immediate switch on scan complete */ if (!IEEE80211_IS_CHAN_DTURBO(ic->ic_curchan) && - time_after(ticks, ic->ic_lastdata + vap->iv_bgscanidle)) + ieee80211_time_after(ticks, ic->ic_lastdata + vap->iv_bgscanidle)) ieee80211_bg_scan(vap, 0); return; } |