Date: Wed, 25 Mar 2009 03:02:03 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r190402 - head/sys/net80211 Message-ID: <200903250302.n2P323ST063878@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sam Date: Wed Mar 25 03:02:03 2009 New Revision: 190402 URL: http://svn.freebsd.org/changeset/base/190402 Log: shuffle code so things build w/o INVARIANTS or IEEE80211_SUPPORT_SUPERG Prodded by: several Modified: head/sys/net80211/ieee80211_sta.c Modified: head/sys/net80211/ieee80211_sta.c ============================================================================== --- head/sys/net80211/ieee80211_sta.c Wed Mar 25 01:50:56 2009 (r190401) +++ head/sys/net80211/ieee80211_sta.c Wed Mar 25 03:02:03 2009 (r190402) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903250302.n2P323ST063878>