From owner-svn-src-head@FreeBSD.ORG Wed Mar 25 03:02:03 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C24E1106564A; Wed, 25 Mar 2009 03:02:03 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B136A8FC1F; Wed, 25 Mar 2009 03:02:03 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2P323xr063879; Wed, 25 Mar 2009 03:02:03 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2P323ST063878; Wed, 25 Mar 2009 03:02:03 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200903250302.n2P323ST063878@svn.freebsd.org> From: Sam Leffler Date: Wed, 25 Mar 2009 03:02:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190402 - head/sys/net80211 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2009 03:02:04 -0000 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