From owner-p4-projects@FreeBSD.ORG  Mon Feb 11 10:33:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4B84916A41B; Mon, 11 Feb 2008 10:33:00 +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 E785D16A417
	for <perforce@FreeBSD.org>; Mon, 11 Feb 2008 10:32:59 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CF73213C457
	for <perforce@FreeBSD.org>; Mon, 11 Feb 2008 10:32:59 +0000 (UTC)
	(envelope-from sephe@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 m1BAWxDk080631
	for <perforce@FreeBSD.org>; Mon, 11 Feb 2008 10:32:59 GMT
	(envelope-from sephe@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1BAWx73080628
	for perforce@freebsd.org; Mon, 11 Feb 2008 10:32:59 GMT
	(envelope-from sephe@FreeBSD.org)
Date: Mon, 11 Feb 2008 10:32:59 GMT
Message-Id: <200802111032.m1BAWx73080628@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sephe@FreeBSD.org using -f
From: Sepherosa Ziehau <sephe@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 135205 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: Mon, 11 Feb 2008 10:33:00 -0000

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

Change 135205 by sephe@sephe_zealot:sam_wifi on 2008/02/11 10:32:44

	Before add real txpower limit support to 2560 part, force channel
	TX power to 24(dBm?)

Affected files ...

.. //depot/projects/wifi/sys/dev/ral/rt2560.c#35 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ral/rt2560.c#35 (text) ====

@@ -2230,6 +2230,7 @@
 	if (chan == 0 || chan == IEEE80211_CHAN_ANY)
 		return;
 
+#if 0
 	if (IEEE80211_IS_CHAN_2GHZ(c))
 		power = min(sc->txpow[chan - 1], 31);
 	else
@@ -2237,6 +2238,9 @@
 
 	/* adjust txpower using ifconfig settings */
 	power -= (100 - ic->ic_txpowlimit) / 8;
+#else
+	power = 24;
+#endif
 
 	DPRINTFN(2, ("setting channel to %u, txpower to %u\n", chan, power));