From owner-svn-src-all@FreeBSD.ORG  Tue Mar 22 13:35:56 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DE22C106566B;
	Tue, 22 Mar 2011 13:35:56 +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 CD3518FC08;
	Tue, 22 Mar 2011 13:35:56 +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 p2MDZutZ061083;
	Tue, 22 Mar 2011 13:35:56 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2MDZu8k061080;
	Tue, 22 Mar 2011 13:35:56 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201103221335.p2MDZu8k061080@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 22 Mar 2011 13:35:56 +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: r219869 - in head/sys: conf dev/ath
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Mar 2011 13:35:57 -0000

Author: adrian
Date: Tue Mar 22 13:35:56 2011
New Revision: 219869
URL: http://svn.freebsd.org/changeset/base/219869

Log:
  Flip this over to be a configurable option for people who wish to play with it.
  
  It's still not ready for prime-time - there's some TX niggles with these 11n
  cards that I'm still trying to wrap my head around, and AMPDU-TX is just not
  implemented so things will come to a crashing halt if you're not careful.

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

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Tue Mar 22 13:20:11 2011	(r219868)
+++ head/sys/conf/options	Tue Mar 22 13:35:56 2011	(r219869)
@@ -783,6 +783,7 @@ 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	Tue Mar 22 13:20:11 2011	(r219868)
+++ head/sys/dev/ath/if_ath.c	Tue Mar 22 13:35:56 2011	(r219869)
@@ -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	DO_ATH_11N
+#ifdef	AH_ENABLE_11N
 	/*
 	 * Query HT capabilities
 	 */