From owner-p4-projects@FreeBSD.ORG  Tue May 27 21:11:29 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 78EFF1065672; Tue, 27 May 2008 21:11:29 +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 2319C1065670
	for <perforce@freebsd.org>; Tue, 27 May 2008 21:11:29 +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 15AED8FC18
	for <perforce@freebsd.org>; Tue, 27 May 2008 21:11:29 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4RLBSCC041785
	for <perforce@freebsd.org>; Tue, 27 May 2008 21:11:28 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4RLBSXE041783
	for perforce@freebsd.org; Tue, 27 May 2008 21:11:28 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 27 May 2008 21:11:28 GMT
Message-Id: <200805272111.m4RLBSXE041783@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 142408 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: Tue, 27 May 2008 21:11:29 -0000

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

Change 142408 by sam@sam_ebb on 2008/05/27 21:10:54

	don't override the txpower cap installed by ieee80211_alloc_node;
	we use ic_txpowlimit (for now) to initialize all new sta entries

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_node.c#35 edit

Differences ...

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

@@ -1010,7 +1010,6 @@
 		ieee80211_node_initref(ni);		/* mark referenced */
 		/* NB: required by ieee80211_fix_rate */
 		ieee80211_node_set_chan(ni, vap->iv_bss->ni_chan);
-		ni->ni_txpower = vap->iv_bss->ni_txpower;
 		ieee80211_crypto_resetkey(vap, &ni->ni_ucastkey,
 			IEEE80211_KEYIX_NONE);
 		/* XXX optimize away */
@@ -1036,7 +1035,6 @@
 		 * Inherit from iv_bss.
 		 */
 		ni->ni_authmode = vap->iv_bss->ni_authmode;
-		ni->ni_txpower = vap->iv_bss->ni_txpower;
 		ni->ni_vlan = vap->iv_bss->ni_vlan;	/* XXX?? */
 		IEEE80211_ADDR_COPY(ni->ni_bssid, vap->iv_bss->ni_bssid);
 		ieee80211_node_set_chan(ni, vap->iv_bss->ni_chan);
@@ -1067,7 +1065,6 @@
 		 * Inherit any manually configured settings.
 		 */
 		ni->ni_authmode = vap->iv_bss->ni_authmode;
-		ni->ni_txpower = vap->iv_bss->ni_txpower;
 		ni->ni_vlan = vap->iv_bss->ni_vlan;
 		ieee80211_node_set_chan(ni, chan);
 		/* NB: propagate ssid so available to WPA supplicant */