From owner-svn-src-head@FreeBSD.ORG  Thu Jan 20 09:46:18 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 EC1E21065673;
	Thu, 20 Jan 2011 09:46:18 +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 DAD978FC14;
	Thu, 20 Jan 2011 09:46:18 +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 p0K9kIMW008301;
	Thu, 20 Jan 2011 09:46:18 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0K9kIZg008299;
	Thu, 20 Jan 2011 09:46:18 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201101200946.p0K9kIZg008299@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 20 Jan 2011 09:46:18 +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: r217634 - head/sys/dev/ath/ath_hal/ar5416
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, 20 Jan 2011 09:46:19 -0000

Author: adrian
Date: Thu Jan 20 09:46:18 2011
New Revision: 217634
URL: http://svn.freebsd.org/changeset/base/217634

Log:
  Only enable 11n modes if the chipset suports 11n.
  
  Since the AR2427 doesn't allow 802.11n, it shouldn't have them
  configured.

Modified:
  head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c	Thu Jan 20 09:39:16 2011	(r217633)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c	Thu Jan 20 09:46:18 2011	(r217634)
@@ -40,14 +40,18 @@ u_int
 ar5416GetWirelessModes(struct ath_hal *ah)
 {
 	u_int mode;
+	struct ath_hal_private *ahpriv = AH_PRIVATE(ah);
+	HAL_CAPABILITIES *pCap = &ahpriv->ah_caps;
 
 	mode = ar5212GetWirelessModes(ah);
-	if (mode & HAL_MODE_11A)
+
+	/* Only enable HT modes if the NIC supports HT */
+	if (pCap->halHTSupport == AH_TRUE && (mode & HAL_MODE_11A))
 		mode |= HAL_MODE_11NA_HT20
 		     |  HAL_MODE_11NA_HT40PLUS
 		     |  HAL_MODE_11NA_HT40MINUS
 		     ;
-	if (mode & HAL_MODE_11G)
+	if (pCap->halHTSupport == AH_TRUE && (mode & HAL_MODE_11G))
 		mode |= HAL_MODE_11NG_HT20
 		     |  HAL_MODE_11NG_HT40PLUS
 		     |  HAL_MODE_11NG_HT40MINUS