PERFORCE change 133138 for review

[Sam Leffler]

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

Change 133138 by sam at 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