svn commit: r220053 - in head/sys: conf dev/ath

Adrian Chadd adrian at FreeBSD.org
Sun Mar 27 08:47:55 UTC 2011


Author: adrian
Date: Sun Mar 27 08:47:55 2011
New Revision: 220053
URL: http://svn.freebsd.org/changeset/base/220053

Log:
  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.

Modified:
  head/sys/conf/options
  head/sys/dev/ath/if_ath.c
  head/sys/dev/ath/if_athvar.h

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Sun Mar 27 08:44:27 2011	(r220052)
+++ head/sys/conf/options	Sun Mar 27 08:47:55 2011	(r220053)
@@ -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

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Sun Mar 27 08:44:27 2011	(r220052)
+++ head/sys/dev/ath/if_ath.c	Sun Mar 27 08:47:55 2011	(r220053)
@@ -612,7 +612,7 @@ ath_attach(u_int16_t devid, struct ath_s
 	 * Don't think of doing that unless you know what you're doing.
 	 */
 
-#ifdef	AH_ENABLE_11N
+#ifdef	ATH_ENABLE_11N
 	/*
 	 * Query HT capabilities
 	 */

Modified: head/sys/dev/ath/if_athvar.h
==============================================================================
--- head/sys/dev/ath/if_athvar.h	Sun Mar 27 08:44:27 2011	(r220052)
+++ head/sys/dev/ath/if_athvar.h	Sun Mar 27 08:47:55 2011	(r220053)
@@ -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


More information about the svn-src-head mailing list