From owner-svn-src-head@FreeBSD.ORG  Sat Feb  7 01:54:57 2009
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 DB76C1065670;
	Sat,  7 Feb 2009 01:54:57 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CA0448FC1F;
	Sat,  7 Feb 2009 01:54:57 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n171sv6m077605;
	Sat, 7 Feb 2009 01:54:57 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n171svoE077604;
	Sat, 7 Feb 2009 01:54:57 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200902070154.n171svoE077604@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Sat, 7 Feb 2009 01:54:57 +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: r188264 - head/sys/dev/ath/ath_hal
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: Sat, 07 Feb 2009 01:54:58 -0000

Author: sam
Date: Sat Feb  7 01:54:57 2009
New Revision: 188264
URL: http://svn.freebsd.org/changeset/base/188264

Log:
  fix 11n channel construction

Modified:
  head/sys/dev/ath/ath_hal/ah_regdomain.c

Modified: head/sys/dev/ath/ath_hal/ah_regdomain.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_regdomain.c	Sat Feb  7 01:53:44 2009	(r188263)
+++ head/sys/dev/ath/ath_hal/ah_regdomain.c	Sat Feb  7 01:54:57 2009	(r188264)
@@ -1706,16 +1706,16 @@ static const struct cmode modes[] = {
 	  IEEE80211_CHAN_G | IEEE80211_CHAN_QUARTER },
 	{ HAL_MODE_11G_HALF_RATE,
 	  IEEE80211_CHAN_G | IEEE80211_CHAN_HALF },
-	{ HAL_MODE_11NG_HT20,	IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_HT20 },
+	{ HAL_MODE_11NG_HT20,	IEEE80211_CHAN_G | IEEE80211_CHAN_HT20 },
 	{ HAL_MODE_11NG_HT40PLUS,
-	  IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_HT40U },
+	  IEEE80211_CHAN_G | IEEE80211_CHAN_HT40U },
 	{ HAL_MODE_11NG_HT40MINUS,
-	  IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_HT40D },
-	{ HAL_MODE_11NA_HT20,	IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_HT20 },
+	  IEEE80211_CHAN_G | IEEE80211_CHAN_HT40D },
+	{ HAL_MODE_11NA_HT20,	IEEE80211_CHAN_A | IEEE80211_CHAN_HT20 },
 	{ HAL_MODE_11NA_HT40PLUS,
-	  IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_HT40U },
+	  IEEE80211_CHAN_A | IEEE80211_CHAN_HT40U },
 	{ HAL_MODE_11NA_HT40MINUS,
-	  IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_HT40D },
+	  IEEE80211_CHAN_A | IEEE80211_CHAN_HT40D },
 };
 
 static OS_INLINE uint16_t