PERFORCE change 142408 for review

[Sam Leffler]

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

Change 142408 by sam at 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 */