From owner-svn-src-head@FreeBSD.ORG  Thu Apr 28 12:52:01 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 DD6B5106566C;
	Thu, 28 Apr 2011 12:52:01 +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 CA4E98FC0A;
	Thu, 28 Apr 2011 12:52:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p3SCq1xi023727;
	Thu, 28 Apr 2011 12:52:01 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3SCq1vm023725;
	Thu, 28 Apr 2011 12:52:01 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201104281252.p3SCq1vm023725@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 28 Apr 2011 12:52:01 +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: r221164 - head/sys/mips/conf
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: Thu, 28 Apr 2011 12:52:02 -0000

Author: adrian
Date: Thu Apr 28 12:52:01 2011
New Revision: 221164
URL: http://svn.freebsd.org/changeset/base/221164

Log:
  Re-enable the wireless build parameters for the AR9130 WMAC.
  
  * enable 11n
  * add ath_ahb so the AHB<->ath glue is linked in
  * disable descriptor order swapping, it isn't needed here
  * disable interrupt mitigation, it isn't supported here

Modified:
  head/sys/mips/conf/AR91XX_BASE

Modified: head/sys/mips/conf/AR91XX_BASE
==============================================================================
--- head/sys/mips/conf/AR91XX_BASE	Thu Apr 28 12:47:40 2011	(r221163)
+++ head/sys/mips/conf/AR91XX_BASE	Thu Apr 28 12:52:01 2011	(r221164)
@@ -49,24 +49,27 @@ options         UFS_DIRHASH             
 options		IEEE80211_DEBUG
 options		IEEE80211_SUPPORT_MESH
 options		IEEE80211_SUPPORT_TDMA
-#device		wlan            # 802.11 support
-#device		wlan_wep        # 802.11 WEP support
-#device		wlan_ccmp       # 802.11 CCMP support
-#device		wlan_tkip       # 802.11 TKIP support
-#device		wlan_xauth	# 802.11 hostap support
+device		wlan            # 802.11 support
+device		wlan_wep        # 802.11 WEP support
+device		wlan_ccmp       # 802.11 CCMP support
+device		wlan_tkip       # 802.11 TKIP support
+device		wlan_xauth	# 802.11 hostap support
 
 # This will come later -adrian
-#device		ath             # Atheros pci/cardbus NIC's
+device		ath             # Atheros pci/cardbus NIC's
+device		ath_rate_sample
+device		ath_ahb
 options 	ATH_DEBUG
 options		ATH_DIAGAPI
+option		ATH_ENABLE_11N
+
+device		ath_hal
+
 options		AH_DEBUG
-#device		ath_hal
 option		AH_SUPPORT_AR5416
-option		AH_RXCFG_SDMAMW_4BYTES  # See NOTES for details of this WAR
-option		AH_NEED_DESC_SWAP	# ?
-#device		ath_rate_sample
-#device		ath_ahb
-option		AH_AR5416_INTERRUPT_MITIGATION
+option		AH_SUPPORT_AR9130	# Makes other chipsets not function!
+# interrupt mitigation not possible on AR9130
+# option		AH_AR5416_INTERRUPT_MITIGATION
 
 device		mii
 device		arge