From owner-p4-projects@FreeBSD.ORG  Sat Jan 12 23:33: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 933E716A421; Sat, 12 Jan 2008 23:33: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 5770016A418
	for <perforce@freebsd.org>; Sat, 12 Jan 2008 23:33: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 BDCD813C447
	for <perforce@freebsd.org>; Sat, 12 Jan 2008 23:33:28 +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 m0CNXS4H048972
	for <perforce@freebsd.org>; Sat, 12 Jan 2008 23:33:28 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0CNXSME048966
	for perforce@freebsd.org; Sat, 12 Jan 2008 23:33:28 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 12 Jan 2008 23:33:28 GMT
Message-Id: <200801122333.m0CNXSME048966@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 133138 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: Sat, 12 Jan 2008 23:33:29 -0000

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

Change 133138 by sam@sam_ebb on 2008/01/12 23:33:15

	bandaid uses of ni_rssi; probably need to track last rssi
	value for use by rate control algorithms but for now use
	the rolling avg

Affected files ...

.. //depot/projects/vap/sys/dev/iwi/if_iwi.c#11 edit
.. //depot/projects/vap/sys/dev/ral/rt2560.c#5 edit
.. //depot/projects/vap/sys/dev/ral/rt2661.c#5 edit
.. //depot/projects/vap/sys/dev/usb/if_rum.c#5 edit

Differences ...

==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#11 (text+ko) ====

@@ -2882,7 +2882,7 @@
 			goto done;
 	}
 
-	error = iwi_set_sensitivity(sc, ni->ni_rssi);
+	error = iwi_set_sensitivity(sc, ic->ic_node_getrssi(ni));
 	if (error != 0)
 		goto done;
 

==== //depot/projects/vap/sys/dev/ral/rt2560.c#5 (text) ====

@@ -1972,7 +1972,8 @@
 		data->id.id_len = m0->m_pkthdr.len;
 		data->id.id_rateidx = ni->ni_txrate;
 		data->id.id_node = ni;
-		data->id.id_rssi = ni->ni_rssi;
+		/* XXX probably need last rssi value and not avg */
+		data->id.id_rssi = ic->ic_node_getrssi(ni);
 	} else
 		data->id.id_node = NULL;
 

==== //depot/projects/vap/sys/dev/ral/rt2661.c#5 (text) ====

@@ -1144,7 +1144,7 @@
 		if (ni != NULL) {
 			/* Error happened during RSSI conversion. */
 			if (rssi < 0)
-				rssi = ni->ni_rssi;
+				rssi = -30;	/* XXX ignored by net80211 */
 
 			(void) ieee80211_input(ni, m, rssi,
 			    RT2661_NOISE_FLOOR, 0);
@@ -1734,7 +1734,8 @@
 		data->id.id_len = m0->m_pkthdr.len;
 		data->id.id_rateidx = ni->ni_txrate;
 		data->id.id_node = ni;
-		data->id.id_rssi = ni->ni_rssi;
+		/* XXX probably want last value, not avg */
+		data->id.id_rssi = ic->ic_node_getrssi(ni);
 	} else
 		data->id.id_node = NULL;
 

==== //depot/projects/vap/sys/dev/usb/if_rum.c#5 (text+ko) ====

@@ -941,7 +941,7 @@
 	if (ni != NULL) {
 		/* Error happened during RSSI conversion. */
 		if (rssi < 0)
-			rssi = ni->ni_rssi;
+			rssi = -30;	/* XXX ignored by net80211 */
 		(void) ieee80211_input(ni, m, rssi, RT2573_NOISE_FLOOR, 0);
 		ieee80211_free_node(ni);
 	} else