From owner-svn-src-projects@FreeBSD.ORG Wed Jan 28 19:34:40 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2C201065672; Wed, 28 Jan 2009 19:34:40 +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 A55F78FC1F; Wed, 28 Jan 2009 19:34:40 +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 n0SJYeiF030632; Wed, 28 Jan 2009 19:34:40 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0SJYeQX030630; Wed, 28 Jan 2009 19:34:40 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901281934.n0SJYeQX030630@svn.freebsd.org> From: Sam Leffler Date: Wed, 28 Jan 2009 19:34:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187848 - in projects/vap7/sys: . contrib/pf dev dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar54... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jan 2009 19:34:41 -0000 Author: sam Date: Wed Jan 28 19:34:40 2009 New Revision: 187848 URL: http://svn.freebsd.org/changeset/base/187848 Log: merge r187510: correct typo that left programmed sifs time in the slot time Modified: projects/vap7/sys/ (props changed) projects/vap7/sys/contrib/pf/ (props changed) projects/vap7/sys/dev/ (props changed) projects/vap7/sys/dev/ath/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5210/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5211/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c projects/vap7/sys/dev/ath/ath_hal/ar5212/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/vap7/sys/dev/ath/ath_hal/ar5312/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5416/ (props changed) projects/vap7/sys/dev/cxgb/ (props changed) projects/vap7/sys/dev/usb2/ (props changed) projects/vap7/sys/i386/conf/USB2 (props changed) projects/vap7/sys/modules/usb2/ (props changed) projects/vap7/sys/net80211/ (props changed) Modified: projects/vap7/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c ============================================================================== --- projects/vap7/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c Wed Jan 28 19:32:19 2009 (r187847) +++ projects/vap7/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c Wed Jan 28 19:34:40 2009 (r187848) @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5211_misc.c,v 1.7 2008/11/27 22:29:52 sam Exp $ + * $FreeBSD$ */ #include "opt_ah.h" @@ -432,7 +432,7 @@ ar5211SetSifsTime(struct ath_hal *ah, u_ } else { /* convert to system clocks */ OS_REG_WRITE(ah, AR_D_GBL_IFS_SIFS, ath_hal_mac_clks(ah, us)); - ahp->ah_slottime = us; + ahp->ah_sifstime = us; return AH_TRUE; } } Modified: projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c ============================================================================== --- projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c Wed Jan 28 19:32:19 2009 (r187847) +++ projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c Wed Jan 28 19:34:40 2009 (r187848) @@ -453,7 +453,7 @@ ar5212SetSifsTime(struct ath_hal *ah, u_ } else { /* convert to system clocks */ OS_REG_WRITE(ah, AR_D_GBL_IFS_SIFS, ath_hal_mac_clks(ah, us)); - ahp->ah_slottime = us; + ahp->ah_sifstime = us; return AH_TRUE; } }