svn commit: r228800 - in head/sys/dev/ath/ath_hal: ar5212 ar5416

[Adrian Chadd]

Just to be silly :) I reviewed this patchset early this morning and it's fine.

Nothing in the FreeBSD HAL uses the compression code, so unless
someone out there has proprietary extensions which does, this patch is
fine.

I promise to get the AR5210 and AR5211 stuff tested tonight. The
AR5210 at least works fine with -9 and -HEAD before the patch; the
AR5211 is broken when trying to do WPA so I'll have to fix that first.

Thanks,


Adrian

On 22 December 2011 06:09, Dimitry Andric <dim at freebsd.org> wrote:
> Author: dim
> Date: Thu Dec 22 14:09:08 2011
> New Revision: 228800
> URL: http://svn.freebsd.org/changeset/base/228800
>
> Log:
>  Revert r228786.  We'll need to work around the warnings in another way.
>
>  Requested by: adrian
>  MFC after:    1 week
>
> Modified:
>  head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
>  head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
>
> Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
> ==============================================================================
> --- head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c       Thu Dec 22 13:47:36 2011        (r228799)
> +++ head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c       Thu Dec 22 14:09:08 2011        (r228800)
> @@ -574,7 +574,7 @@ ar5212SetDecompMask(struct ath_hal *ah,
>        struct ath_hal_5212 *ahp = AH5212(ah);
>
>         if (keyidx >= HAL_DECOMP_MASK_SIZE)
> -                return AH_FALSE;
> +                return HAL_EINVAL;
>         OS_REG_WRITE(ah, AR_DCM_A, keyidx);
>         OS_REG_WRITE(ah, AR_DCM_D, en ? AR_DCM_D_EN : 0);
>         ahp->ah_decompMask[keyidx] = en;
>
> Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
> ==============================================================================
> --- head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c       Thu Dec 22 13:47:36 2011        (r228799)
> +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c       Thu Dec 22 14:09:08 2011        (r228800)
> @@ -161,7 +161,7 @@ ar5416SetAntennaSwitch(struct ath_hal *a
>  HAL_BOOL
>  ar5416SetDecompMask(struct ath_hal *ah, uint16_t keyidx, int en)
>  {
> -       return AH_TRUE;
> +       return HAL_OK;
>  }
>
>  /* Setup coverage class */