Date: Tue, 21 May 2013 11:16:51 -0700 From: Adrian Chadd <adrian@freebsd.org> To: Glen Barber <gjb@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r250856 - head/sys/dev/ath/ath_hal/ar5416 Message-ID: <CAJ-VmomdZmmtVrgYo6NvVJu9wnCTQukcfcpFPKkTWqOP7HgSjg@mail.gmail.com> In-Reply-To: <20130521164200.GA1643@glenbarber.us> References: <201305211428.r4LES5L8018987@svn.freebsd.org> <20130521164200.GA1643@glenbarber.us>
next in thread | previous in thread | raw e-mail | index | archive | help
Yup, this should be fixed, thanks! Adrian On 21 May 2013 09:42, Glen Barber <gjb@freebsd.org> wrote: > On Tue, May 21, 2013 at 02:28:05PM +0000, Adrian Chadd wrote: >> Author: adrian >> Date: Tue May 21 14:28:05 2013 >> New Revision: 250856 >> URL: http://svnweb.freebsd.org/changeset/base/250856 >> >> Log: >> Fix build break - the SetCapability calls return HAL_BOOL, >> not HAL_STATUS. >> >> Modified: >> head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c >> >> Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c >> ============================================================================== >> --- head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c Tue May 21 13:02:37 2013 (r250855) >> +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c Tue May 21 14:28:05 2013 (r250856) >> @@ -504,7 +504,7 @@ ar5416SetCapability(struct ath_hal *ah, >> return AH_TRUE; >> case HAL_CAP_ENFORCE_TXOP: >> if (capability != 1) >> - return (HAL_ENOTSUPP); >> + return AH_FALSE; >> if (setting) { >> AH5212(ah)->ah_miscMode >> |= AR_PCU_TXOP_TBTT_LIMIT_ENA; > > This breaks tinderbox. > > /src/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c -I/src/sys/dev/ath > -I/src/sys/dev/ath/ath_hal > /src/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c:507:12: error: implicit > conversion from enumeration type 'HAL_STATUS' to different enumeration > type 'HAL_BOOL' [-Werror,-Wenum-conversion] > return (HAL_ENOTSUPP); > ~~~~~~ ^~~~~~~~~~~~ > 1 error generated. > *** Error code 1 > > Stop. > make: stopped in /obj/arm.arm/src/sys/LINT > > Glen >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ-VmomdZmmtVrgYo6NvVJu9wnCTQukcfcpFPKkTWqOP7HgSjg>