From owner-p4-projects@FreeBSD.ORG  Wed Aug 27 15:25:56 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E270C10656D6; Wed, 27 Aug 2008 15:25:55 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A146810656A3
	for <perforce@freebsd.org>; Wed, 27 Aug 2008 15:25:55 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E3BBD8FC18
	for <perforce@freebsd.org>; Wed, 27 Aug 2008 15:25:51 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RFPp1S099947
	for <perforce@freebsd.org>; Wed, 27 Aug 2008 15:25:51 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RFPpB2099945
	for perforce@freebsd.org; Wed, 27 Aug 2008 15:25:51 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 27 Aug 2008 15:25:51 GMT
Message-Id: <200808271525.m7RFPpB2099945@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 148620 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Aug 2008 15:25:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=148620

Change 148620 by sam@sam_ebb on 2008/08/27 15:25:17

	be consistent in checking ni_chw

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_node.c#41 edit
.. //depot/projects/vap/sys/net80211/ieee80211_sta.c#14 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_node.c#41 (text+ko) ====

@@ -2227,7 +2227,7 @@
 	    ic->ic_flags & IEEE80211_F_USEPROT ? ", protection" : "",
 	    ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "",
 	    ni->ni_flags & IEEE80211_NODE_HT ?
-		(ni->ni_chw == 20 ? ", HT20" : ", HT40") : "",
+		(ni->ni_chw == 40 ? ", HT40" : ", HT20") : "",
 	    ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "",
 	    IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ?
 		", fast-frames" : "",

==== //depot/projects/vap/sys/net80211/ieee80211_sta.c#14 (text+ko) ====

@@ -1545,7 +1545,7 @@
 		    ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "",
 		    ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "",
 		    ni->ni_flags & IEEE80211_NODE_HT ?
-			(ni->ni_chw == 20 ? ", HT20" : ", HT40") : "",
+			(ni->ni_chw == 40 ? ", HT40" : ", HT20") : "",
 		    ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "",
 		    IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ?
 			", fast-frames" : "",