From 8fd67f92b0ce59edf0e59cd0027ec91c58ea3d27 Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Sun, 27 Mar 2011 08:47:55 +0000 Subject: [PATCH] Rename AH_ENABLE_11N to ATH_ENABLE_11 - the HAL supports 11n by default but the ath driver doesn't. This is a much more consistent name. --- sys/conf/options | 2 +- sys/dev/ath/if_ath.c | 2 +- sys/dev/ath/if_athvar.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/conf/options b/sys/conf/options index 145b33b5f90..81fb881aaeb 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -768,6 +768,7 @@ ATH_TXBUF opt_ath.h ATH_RXBUF opt_ath.h ATH_DIAGAPI opt_ath.h ATH_TX99_DIAG opt_ath.h +ATH_ENABLE_11N opt_ah.h # options for the Atheros hal AH_SUPPORT_AR5416 opt_ah.h @@ -784,7 +785,6 @@ AH_NEED_DESC_SWAP opt_ah.h AH_USE_INIPDGAIN opt_ah.h AH_MAXCHAN opt_ah.h AH_RXCFG_SDMAMW_4BYTES opt_ah.h -AH_ENABLE_11N opt_ah.h # options for the Broadcom BCM43xx driver (bwi) BWI_DEBUG opt_bwi.h diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 9ecf51f548c..5344e75dca2 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -612,7 +612,7 @@ ath_attach(u_int16_t devid, struct ath_softc *sc) * Don't think of doing that unless you know what you're doing. */ -#ifdef AH_ENABLE_11N +#ifdef ATH_ENABLE_11N /* * Query HT capabilities */ diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h index d096f5026da..4daa2e1347a 100644 --- a/sys/dev/ath/if_athvar.h +++ b/sys/dev/ath/if_athvar.h @@ -46,7 +46,7 @@ /* * 802.11n requires more TX and RX buffers to do AMPDU. */ -#ifdef AH_ENABLE_11N +#ifdef ATH_ENABLE_11N #define ATH_TXBUF 512 #define ATH_RXBUF 512 #endif