From owner-p4-projects@FreeBSD.ORG Tue Jan 6 12:58:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72BEF16A4D1; Tue, 6 Jan 2004 12:58:26 -0800 (PST) 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 3667616A4CE for ; Tue, 6 Jan 2004 12:58:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE0E543D1F for ; Tue, 6 Jan 2004 12:58:24 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i06KwO0B003918 for ; Tue, 6 Jan 2004 12:58:24 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i06KwOvD003915 for perforce@freebsd.org; Tue, 6 Jan 2004 12:58:24 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 6 Jan 2004 12:58:24 -0800 (PST) Message-Id: <200401062058.i06KwOvD003915@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 44882 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: Tue, 06 Jan 2004 20:58:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=44882 Change 44882 by sam@sam_ebb on 2004/01/06 12:58:14 track forthcoming hal changes Affected files ... .. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#6 edit .. //depot/projects/netperf+sockets/sys/dev/ath/if_athvar.h#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#6 (text+ko) ==== @@ -130,7 +130,8 @@ static int ath_newstate(struct ieee80211com *, enum ieee80211_state, int); static void ath_newassoc(struct ieee80211com *, struct ieee80211_node *, int); -static int ath_getchannels(struct ath_softc *, u_int cc, HAL_BOOL outdoor); +static int ath_getchannels(struct ath_softc *, u_int cc, + HAL_BOOL outdoor, HAL_BOOL xchans); static int ath_rate_setup(struct ath_softc *sc, u_int mode); static void ath_setcurmode(struct ath_softc *, enum ieee80211_phymode); @@ -151,6 +152,9 @@ static int ath_outdoor = AH_TRUE; /* outdoor operation */ SYSCTL_INT(_hw_ath, OID_AUTO, outdoor, CTLFLAG_RD, &ath_outdoor, 0, "enable/disable outdoor operation"); +static int ath_xchanmode = AH_TRUE; /* extended channels */ +SYSCTL_INT(_hw_ath, OID_AUTO, xchans, CTLFLAG_RD, &ath_xchanmode, + 0, "enable/disable extended channels"); static int ath_countrycode = CTRY_DEFAULT; /* country code */ SYSCTL_INT(_hw_ath, OID_AUTO, countrycode, CTLFLAG_RD, &ath_countrycode, 0, "country code"); @@ -238,7 +242,8 @@ * is resposible for filtering this list based on settings * like the phy mode. */ - error = ath_getchannels(sc, ath_countrycode, ath_outdoor); + error = ath_getchannels(sc, ath_countrycode, + ath_outdoor, ath_xchanmode); if (error != 0) goto bad; /* @@ -1033,7 +1038,7 @@ ath_hal_setrxfilter(ah, rfilt); /* configure operational mode */ - ath_hal_setopmode(ah, ic->ic_opmode); + ath_hal_setopmode(ah); /* calculate and install multicast filter */ if ((ifp->if_flags & IFF_ALLMULTI) == 0) { @@ -1363,8 +1368,7 @@ DPRINTF(ATH_DEBUG_BEACON, ("%s: intval %u nexttbtt %u\n", __func__, ni->ni_intval, nexttbtt)); ath_hal_intrset(ah, 0); - ath_hal_beaconinit(ah, ic->ic_opmode, - nexttbtt, ni->ni_intval); + ath_hal_beaconinit(ah, nexttbtt, ni->ni_intval); if (ic->ic_opmode != IEEE80211_M_MONITOR) sc->sc_imask |= HAL_INT_SWBA; /* beacon prepare */ ath_hal_intrset(ah, sc->sc_imask); @@ -2653,7 +2657,7 @@ } static int -ath_getchannels(struct ath_softc *sc, u_int cc, HAL_BOOL outdoor) +ath_getchannels(struct ath_softc *sc, u_int cc, HAL_BOOL outdoor, HAL_BOOL xchans) { struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = &ic->ic_if; @@ -2668,7 +2672,7 @@ return ENOMEM; } if (!ath_hal_init_channels(ah, chans, IEEE80211_CHAN_MAX, &nchan, - cc, HAL_MODE_ALL, outdoor)) { + cc, HAL_MODE_ALL, outdoor, xchans)) { if_printf(ifp, "unable to collect channel list from hal\n"); free(chans, M_TEMP); return EINVAL; ==== //depot/projects/netperf+sockets/sys/dev/ath/if_athvar.h#3 (text+ko) ==== @@ -264,8 +264,8 @@ ((*(_ah)->ah_perCalibration)((_ah), (_chan))) #define ath_hal_setledstate(_ah, _state) \ ((*(_ah)->ah_setLedState)((_ah), (_state))) -#define ath_hal_beaconinit(_ah, _opmode, _nextb, _bperiod) \ - ((*(_ah)->ah_beaconInit)((_ah), (_opmode), (_nextb), (_bperiod))) +#define ath_hal_beaconinit(_ah, _nextb, _bperiod) \ + ((*(_ah)->ah_beaconInit)((_ah), (_nextb), (_bperiod))) #define ath_hal_beaconreset(_ah) \ ((*(_ah)->ah_resetStationBeaconTimers)((_ah))) #define ath_hal_beacontimers(_ah, _bs, _tsf, _dc, _cc) \ @@ -273,8 +273,8 @@ (_dc), (_cc))) #define ath_hal_setassocid(_ah, _bss, _associd) \ ((*(_ah)->ah_writeAssocid)((_ah), (_bss), (_associd), 0)) -#define ath_hal_setopmode(_ah, _opmode) \ - ((*(_ah)->ah_setPCUConfig)((_ah), (_opmode))) +#define ath_hal_setopmode(_ah) \ + ((*(_ah)->ah_setPCUConfig)((_ah))) #define ath_hal_stoptxdma(_ah, _qnum) \ ((*(_ah)->ah_stopTxDma)((_ah), (_qnum))) #define ath_hal_stoppcurecv(_ah) \