summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2009-03-25 03:02:03 +0000
committersam <sam@FreeBSD.org>2009-03-25 03:02:03 +0000
commit185450a1c57199eb6a88ee1ee9a61568064a66ad (patch)
treec0a2dd0211fcf8c95e11f47b2fe863a420ebf5e3
parentf7c1e3a6bf90bc3fdd51ddf7eecb359853ac736d (diff)
downloadFreeBSD-src-185450a1c57199eb6a88ee1ee9a61568064a66ad.zip
FreeBSD-src-185450a1c57199eb6a88ee1ee9a61568064a66ad.tar.gz
shuffle code so things build w/o INVARIANTS or IEEE80211_SUPPORT_SUPERG
Prodded by: several
-rw-r--r--sys/net80211/ieee80211_sta.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c
index da9cb4e..3eff98e 100644
--- a/sys/net80211/ieee80211_sta.c
+++ b/sys/net80211/ieee80211_sta.c
@@ -105,9 +105,7 @@ sta_vattach(struct ieee80211vap *vap)
static void
sta_beacon_miss(struct ieee80211vap *vap)
{
- struct ieee80211com *ic = vap->iv_ic;
-
- KASSERT((ic->ic_flags & IEEE80211_F_SCAN) == 0, ("scanning"));
+ KASSERT((vap->iv_ic->ic_flags & IEEE80211_F_SCAN) == 0, ("scanning"));
KASSERT(vap->iv_state == IEEE80211_S_RUN,
("wrong state %d", vap->iv_state));
@@ -133,6 +131,8 @@ sta_beacon_miss(struct ieee80211vap *vap)
vap->iv_stats.is_beacon_miss++;
if (vap->iv_roaming == IEEE80211_ROAMING_AUTO) {
#ifdef IEEE80211_SUPPORT_SUPERG
+ struct ieee80211com *ic = vap->iv_ic;
+
/*
* If we receive a beacon miss interrupt when using
* dynamic turbo, attempt to switch modes before
OpenPOWER on IntegriCloud