From 0cd9c215fa35dad7ae9e49ff93c70e15829b4bb0 Mon Sep 17 00:00:00 2001 From: Sam Leffler Date: Wed, 25 Mar 2009 03:02:03 +0000 Subject: [PATCH] shuffle code so things build w/o INVARIANTS or IEEE80211_SUPPORT_SUPERG Prodded by: several --- sys/net80211/ieee80211_sta.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c index da9cb4ecb05..3eff98ec69b 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