From owner-p4-projects@FreeBSD.ORG Thu Feb 3 00:30:48 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4120416A4DF; Thu, 3 Feb 2005 00:30:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DEF6F16A50F for ; Thu, 3 Feb 2005 00:30:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B04FE43D4C for ; Thu, 3 Feb 2005 00:30:22 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j130UMaA081418 for ; Thu, 3 Feb 2005 00:30:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j130UMHt081415 for perforce@freebsd.org; Thu, 3 Feb 2005 00:30:22 GMT (envelope-from sam@freebsd.org) Date: Thu, 3 Feb 2005 00:30:22 GMT Message-Id: <200502030030.j130UMHt081415@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 70196 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Feb 2005 00:30:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=70196 Change 70196 by sam@sam_ebb on 2005/02/03 00:29:21 minor churn, no functional change Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#3 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#3 (text+ko) ==== @@ -2213,7 +2213,7 @@ */ m = bf->bf_m; ncabq = ath_hal_numtxpending(ah, sc->sc_cabq->axq_qnum); - if (ieee80211_beacon_update(bf->bf_node, &sc->sc_boff, m, ncabq)) { + if (ieee80211_beacon_update(ni, &sc->sc_boff, m, ncabq)) { /* XXX too conservative? */ bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); error = bus_dmamap_load_mbuf(sc->sc_dmat, bf->bf_dmamap, m, @@ -2338,8 +2338,8 @@ { #define MS_TO_TU(x) (((x) * 1000) / 1024) struct ieee80211com *ic = &sc->sc_ic; + struct ath_hal *ah = sc->sc_ah; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); /*XXX*/ - struct ath_hal *ah = sc->sc_ah; struct ieee80211_node *ni = vap->iv_bss; u_int32_t nexttbtt, intval; @@ -2352,7 +2352,7 @@ nexttbtt = roundup(nexttbtt, intval); DPRINTF(sc, ATH_DEBUG_BEACON, "%s: nexttbtt %u intval %u (%u)\n", __func__, nexttbtt, intval, ni->ni_intval); - if (vap->iv_opmode == IEEE80211_M_STA) { + if (ic->ic_opmode == IEEE80211_M_STA) { HAL_BEACON_STATE bs; /* NB: no PCF support right now */ @@ -2417,7 +2417,7 @@ ath_hal_intrset(ah, 0); if (nexttbtt == intval) intval |= HAL_BEACON_RESET_TSF; - if (vap->iv_opmode == IEEE80211_M_IBSS) { + if (ic->ic_opmode == IEEE80211_M_IBSS) { /* * In IBSS mode enable the beacon timers but only * enable SWBA interrupts if we need to manually @@ -2428,7 +2428,7 @@ intval |= HAL_BEACON_ENA; if (!sc->sc_hasveol) sc->sc_imask |= HAL_INT_SWBA; - } else if (vap->iv_opmode == IEEE80211_M_HOSTAP) { + } else if (ic->ic_opmode == IEEE80211_M_HOSTAP) { /* * In AP mode we enable the beacon timers and * SWBA interrupts to prepare beacon frames. @@ -2443,7 +2443,7 @@ * When using a self-linked beacon descriptor in * ibss mode load it once here. */ - if (vap->iv_opmode == IEEE80211_M_IBSS && sc->sc_hasveol) + if (ic->ic_opmode == IEEE80211_M_IBSS && sc->sc_hasveol) ath_beacon_proc(sc, 0); } #undef MS_TO_TU