From owner-p4-projects@FreeBSD.ORG  Sat Jan 31 19:43:33 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EC9F216A4D6; Sat, 31 Jan 2004 19:43:32 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C5AD016A4D0
	for <perforce@freebsd.org>; Sat, 31 Jan 2004 19:43:32 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EF85E43D53
	for <perforce@freebsd.org>; Sat, 31 Jan 2004 19:43:29 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i113hT0B032907
	for <perforce@freebsd.org>; Sat, 31 Jan 2004 19:43:29 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i113hT1P032900
	for perforce@freebsd.org; Sat, 31 Jan 2004 19:43:29 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Sat, 31 Jan 2004 19:43:29 -0800 (PST)
Message-Id: <200402010343.i113hT1P032900@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>
Subject: PERFORCE change 46288 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sun, 01 Feb 2004 03:43:33 -0000

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

Change 46288 by sam@sam_ebb on 2004/01/31 19:43:27

	use per-node transmit power setting

Affected files ...

.. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#21 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#21 (text+ko) ====

@@ -1127,8 +1127,9 @@
 	(((_ic)->ic_flags & (IEEE80211_F_SHPREAMBLE | IEEE80211_F_USEBARKER))\
 		== IEEE80211_F_SHPREAMBLE)
 	struct ieee80211com *ic = &sc->sc_ic;
+	struct ieee80211_node *ni = bf->bf_node;
 	struct ath_hal *ah = sc->sc_ah;
-	struct ath_node *an = ATH_NODE(bf->bf_node);
+	struct ath_node *an = ATH_NODE(ni);
 	struct ath_desc *ds;
 	int error;
 	u_int8_t rate;
@@ -1159,7 +1160,7 @@
 		, m->m_pkthdr.len + IEEE80211_CRC_LEN	/* packet length */
 		, sizeof(struct ieee80211_frame)	/* header length */
 		, HAL_PKT_TYPE_BEACON		/* Atheros packet type */
-		, 0x20				/* txpower XXX */
+		, MIN(ni->ni_txpower,60)	/* txpower XXX */
 		, rate, 1			/* series 0 rate/tries */
 		, HAL_TXKEYIX_INVALID		/* no encryption */
 		, 0				/* antenna mode */
@@ -2203,7 +2204,7 @@
 		if (iswep)
 			sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_WEP;
 		sc->sc_tx_th.wt_rate = ni->ni_rates.rs_rates[ni->ni_txrate];
-		sc->sc_tx_th.wt_txpower = 60/2;		/* XXX */
+		sc->sc_tx_th.wt_txpower = ni->ni_txpower/2;	/* XXX units */
 		sc->sc_tx_th.wt_antenna = antenna;
 
 		bpf_mtap2(sc->sc_drvbpf,
@@ -2223,7 +2224,7 @@
 		, pktlen		/* packet length */
 		, hdrlen		/* header length */
 		, atype			/* Atheros packet type */
-		, 60			/* txpower XXX */
+		, MIN(ni->ni_txpower,60)/* txpower */
 		, txrate, try0		/* series 0 rate/tries */
 		, iswep ? sc->sc_ic.ic_wep_txkey : HAL_TXKEYIX_INVALID
 		, antenna		/* antenna mode */