From owner-svn-src-head@FreeBSD.ORG  Thu Jan 29 23:11:18 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 A9E8A10656D0;
	Thu, 29 Jan 2009 23:11:18 +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 96CFB8FC27;
	Thu, 29 Jan 2009 23:11:18 +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 n0TNBIr1067733;
	Thu, 29 Jan 2009 23:11:18 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0TNBI5Q067732;
	Thu, 29 Jan 2009 23:11:18 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200901292311.n0TNBI5Q067732@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Thu, 29 Jan 2009 23:11: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: r187898 - head/sys/net80211
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, 29 Jan 2009 23:11:20 -0000

Author: sam
Date: Thu Jan 29 23:11:18 2009
New Revision: 187898
URL: http://svn.freebsd.org/changeset/base/187898

Log:
  set ni_txparms for static turbo mode

Modified:
  head/sys/net80211/ieee80211_node.c

Modified: head/sys/net80211/ieee80211_node.c
==============================================================================
--- head/sys/net80211/ieee80211_node.c	Thu Jan 29 23:09:12 2009	(r187897)
+++ head/sys/net80211/ieee80211_node.c	Thu Jan 29 23:11:18 2009	(r187898)
@@ -227,20 +227,25 @@ static void
 node_setuptxparms(struct ieee80211_node *ni)
 {
 	struct ieee80211vap *vap = ni->ni_vap;
+	enum ieee80211_phymode mode;
 
 	if (ni->ni_flags & IEEE80211_NODE_HT) {
 		if (IEEE80211_IS_CHAN_5GHZ(ni->ni_chan))
-			ni->ni_txparms = &vap->iv_txparms[IEEE80211_MODE_11NA];
+			mode = IEEE80211_MODE_11NA;
 		else
-			ni->ni_txparms = &vap->iv_txparms[IEEE80211_MODE_11NG];
+			mode = IEEE80211_MODE_11NG;
 	} else {				/* legacy rate handling */
-		if (IEEE80211_IS_CHAN_A(ni->ni_chan))
-			ni->ni_txparms = &vap->iv_txparms[IEEE80211_MODE_11A];
+		/* NB: 108A/108G should be handled as 11a/11g respectively */
+		if (IEEE80211_IS_CHAN_ST(ni->ni_chan))
+			mode = IEEE80211_MODE_STURBO_A;
+		else if (IEEE80211_IS_CHAN_A(ni->ni_chan))
+			mode = IEEE80211_MODE_11A;
 		else if (ni->ni_flags & IEEE80211_NODE_ERP)
-			ni->ni_txparms = &vap->iv_txparms[IEEE80211_MODE_11G];
+			mode = IEEE80211_MODE_11G;
 		else
-			ni->ni_txparms = &vap->iv_txparms[IEEE80211_MODE_11B];
+			mode = IEEE80211_MODE_11B;
 	}
+	ni->ni_txparms = &vap->iv_txparms[mode];
 }
 
 /*