[PATCH] adm8211, p54, zd1211rw-d80211: Update to new statistics reporting API

[PATCH] adm8211, p54, zd1211rw-d80211: Update to new statistics reporting API

[Michael Wu]

[-- Attachment #1: Type: text/plain, Size: 2940 bytes --]

adm8211, p54, zd1211rw-d80211: Update to new statistics reporting API

This patch updates adm8211, p54, and zd1211rw-d80211 to the new statistics
reporting API in d80211.

Signed-off-by: Michael Wu <flamingice@sourmilk.net>
---

 drivers/net/wireless/d80211/adm8211/adm8211.c   |   10 +---------
 drivers/net/wireless/d80211/p54/prism54common.c |    2 +-
 drivers/net/wireless/d80211/zd1211rw/zd_mac.c   |    3 ++-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/net/wireless/d80211/adm8211/adm8211.c 
b/drivers/net/wireless/d80211/adm8211/adm8211.c
index 3bdcec3..ee8939b 100644
--- a/drivers/net/wireless/d80211/adm8211/adm8211.c
+++ b/drivers/net/wireless/d80211/adm8211/adm8211.c
@@ -564,14 +564,6 @@ static void adm8211_interrupt_rci(struct
 			if (dev->flags & IFF_PROMISC)
 				skb_trim(skb, skb->len - FCS_LEN);
 
-
-/* FIXME: The following set of assignments supply additional data for 
wireless statistics. The
-	  necessary quantities are (1) the "noise" value in dBm, and (2) 
the "signal" value in dBm.
-	  The present code supplies dummy values for these quantities. */
-
-			rx_status.noise = -85;   /* FIXME */
-			rx_status.signal = rx_status.ssi - ADM8211_RX_MAX_SSI; /* FIXME */
-
 			ieee80211_rx_irqsafe(dev, skb, &rx_status);
 		}
 
@@ -2033,7 +2025,7 @@ static int __devinit adm8211_probe(struc
 	// however, IEEE80211_HW_RX_INCLUDES_FCS in promisc mode
 
 	dev->channel_change_time = 1000;
-	dev->maxssi = ADM8211_RX_MAX_SSI;// FIXME - This is an approximation
+	dev->max_rssi = ADM8211_RX_MAX_SSI;// FIXME - This is an approximation
 
 	priv->modes[0].mode = MODE_IEEE80211B;
 	/* channel info filled in by adm8211_read_eeprom */
diff --git a/drivers/net/wireless/d80211/p54/prism54common.c 
b/drivers/net/wireless/d80211/p54/prism54common.c
index fd4ea5d..848e450 100644
--- a/drivers/net/wireless/d80211/p54/prism54common.c
+++ b/drivers/net/wireless/d80211/p54/prism54common.c
@@ -773,7 +773,7 @@ struct ieee80211_hw *p54_init_common(siz
 		    IEEE80211_HW_DATA_NULLFUNC_ACK; /* TODO: check */
 		    /* IEEE80211_HW_MONITOR_DURING_OPER FIXME: check */
 	dev->channel_change_time = 1000;	/* TODO: find actual value */
-	dev->maxssi = 100; // just to avoid dividing by zero
+	dev->max_rssi = 100;
 
 	dev->queues = 1;
 	dev->extra_tx_headroom = sizeof(struct p54_control_hdr) + 4 +
diff --git a/drivers/net/wireless/d80211/zd1211rw/zd_mac.c 
b/drivers/net/wireless/d80211/zd1211rw/zd_mac.c
index c3144d5..cd7d135 100644
--- a/drivers/net/wireless/d80211/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/d80211/zd1211rw/zd_mac.c
@@ -607,7 +607,8 @@ struct ieee80211_hw *zd_mac_alloc(struct
 
 	dev->flags = IEEE80211_HW_RX_INCLUDES_FCS |
 		     IEEE80211_HW_WEP_INCLUDE_IV;
-	dev->maxssi = 100;
+	dev->max_rssi = 100;
+	dev->max_signal = 100;
 
 	dev->queues = 1;
 	dev->extra_tx_headroom = sizeof(struct zd_ctrlset);

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]