From owner-svn-src-head@FreeBSD.ORG  Sun Mar 27 08:47:55 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B07CC1065670;
	Sun, 27 Mar 2011 08:47:55 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A16068FC14;
	Sun, 27 Mar 2011 08:47:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2R8ltcs051637;
	Sun, 27 Mar 2011 08:47:55 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2R8ltJJ051633;
	Sun, 27 Mar 2011 08:47:55 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201103270847.p2R8ltJJ051633@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 27 Mar 2011 08:47:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220053 - in head/sys: conf dev/ath
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Mar 2011 08:47:55 -0000

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