From owner-svn-src-projects@FreeBSD.ORG Thu Feb 19 06:01:27 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 7DAFB106564A; Thu, 19 Feb 2009 06:01:27 +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 500CC8FC18; Thu, 19 Feb 2009 06:01:27 +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 n1J61Rvt087176; Thu, 19 Feb 2009 06:01:27 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1J61RuA087174; Thu, 19 Feb 2009 06:01:27 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200902190601.n1J61RuA087174@svn.freebsd.org> From: Sam Leffler Date: Thu, 19 Feb 2009 06:01:27 +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: r188803 - 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: Thu, 19 Feb 2009 06:01:27 -0000 Author: sam Date: Thu Feb 19 06:01:26 2009 New Revision: 188803 URL: http://svn.freebsd.org/changeset/base/188803 Log: merge r188084: fix building w/ AH_DEBUG 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/ah_regdomain.c 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/ar5212/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5312/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5416/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c 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/ah_regdomain.c ============================================================================== --- projects/vap7/sys/dev/ath/ath_hal/ah_regdomain.c Thu Feb 19 05:59:50 2009 (r188802) +++ projects/vap7/sys/dev/ath/ath_hal/ah_regdomain.c Thu Feb 19 06:01:26 2009 (r188803) @@ -2233,7 +2233,7 @@ assignPrivateChannels(struct ath_hal *ah /* new entry, assign a private channel entry */ if (next >= N(AH_PRIVATE(ah)->ah_channels)) { HALDEBUG(ah, HAL_DEBUG_ANY, - "%s: too many channels, max %u\n", + "%s: too many channels, max %zu\n", __func__, N(AH_PRIVATE(ah)->ah_channels)); return AH_FALSE; } Modified: projects/vap7/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c ============================================================================== --- projects/vap7/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c Thu Feb 19 05:59:50 2009 (r188802) +++ projects/vap7/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c Thu Feb 19 06:01:26 2009 (r188803) @@ -392,7 +392,7 @@ ar5416PerCalibrationN(struct ath_hal *ah HAL_CAL_LIST *currCal = cal->cal_curr; HAL_CHANNEL_INTERNAL *ichan; - OS_MARK(ah, AH_MARK_PERCAL, chan->channel); + OS_MARK(ah, AH_MARK_PERCAL, chan->ic_freq); *isCalDone = AH_TRUE;