These patches modify the rt2x00-d80211 family of drivers to use
the wireless statics added in patch 1.
Signed-Off-By: Larry [EMAIL PROTECTED]>
Index: wireless-dev/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
===================================================================
--- wireless-dev.orig/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
+++ wireless-dev/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
@@ -1695,6 +1695,14 @@ static void rt2400pci_rxdone(void *data)
rt2x00dev->rx_params.ssi =
rt2x00_get_field32(rxd->word2, RXD_W2_RSSI);
+/* 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. */
+
+ rt2x00dev->rx_params.noise = -85; /* FIXME */
+ rt2x00dev->rx_params.signal =
+ rt2x00dev->rx_params.ssi - RT2X00_RX_MAX_SSI;
/* FIXME */
+
__ieee80211_rx(ring->net_dev,
skb, &rt2x00dev->rx_params);
}
@@ -2581,6 +2589,7 @@ static int rt2400pci_init_hw(struct rt2x
hw->device_strips_mic = 0;
hw->monitor_during_oper = 1;
hw->fraglist = 0;
+ hw->maxssi = RT2X00_RX_MAX_SSI;
/*
* We have 2 TX queues: TX and PRIO.
Index: wireless-dev/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
===================================================================
--- wireless-dev.orig/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
+++ wireless-dev/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
@@ -1841,6 +1841,14 @@ static void rt2500pci_rxdone(void *data)
rt2x00dev->rx_params.ssi =
rt2x00_get_field32(rxd->word2, RXD_W2_RSSI);
+/* 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. */
+
+ rt2x00dev->rx_params.noise = -85; /* FIXME */
+ rt2x00dev->rx_params.signal =
+ rt2x00dev->rx_params.ssi - RT2X00_RX_MAX_SSI;
/* FIXME */
+
__ieee80211_rx(ring->net_dev,
skb, &rt2x00dev->rx_params);
@@ -2735,6 +2743,7 @@ static int rt2500pci_init_hw(struct rt2x
hw->device_strips_mic = 0;
hw->monitor_during_oper = 1;
hw->fraglist = 0;
+ hw->maxssi = RT2X00_RX_MAX_SSI;
/*
* We have 2 TX queues: TX and PRIO.
Index: wireless-dev/drivers/net/wireless/d80211/rt2x00/rt2500usb.c
===================================================================
--- wireless-dev.orig/drivers/net/wireless/d80211/rt2x00/rt2500usb.c
+++ wireless-dev/drivers/net/wireless/d80211/rt2x00/rt2500usb.c
@@ -1627,6 +1627,14 @@ static void rt2500usb_rxdone(void *data)
rt2x00dev->rx_params.ssi =
rt2x00_get_field32(rxd->word1, RXD_W1_RSSI);
+/* 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. */
+
+ rt2x00dev->rx_params.noise = -85; /* FIXME */
+ rt2x00dev->rx_params.signal =
+ rt2x00dev->rx_params.ssi - RT2X00_RX_MAX_SSI;
/* FIXME */
+
__ieee80211_rx(ring->net_dev,
skb, &rt2x00dev->rx_params);
@@ -2423,6 +2431,7 @@ static int rt2500usb_init_hw(struct rt2x
hw->device_strips_mic = 0;
hw->monitor_during_oper = 1;
hw->fraglist = 0;
+ hw->maxssi = RT2X00_RX_MAX_SSI;
/*
* We have 2 TX queues: TX and PRIO.
Index: wireless-dev/drivers/net/wireless/d80211/rt2x00/rt2x00.h
===================================================================
--- wireless-dev.orig/drivers/net/wireless/d80211/rt2x00/rt2x00.h
+++ wireless-dev/drivers/net/wireless/d80211/rt2x00/rt2x00.h
@@ -850,6 +850,8 @@ struct rt2x00_dev {
#define CONFIG_DOUBLE_ANTENNA 0x00010000
#define CONFIG_DISABLE_BBP_TUNING 0x00020000
+#define RT2X00_RX_MAX_SSI 100
+
/*
* Chipset identification.
*/
Index: wireless-dev/drivers/net/wireless/d80211/rt2x00/rt61pci.c
===================================================================
--- wireless-dev.orig/drivers/net/wireless/d80211/rt2x00/rt61pci.c
+++ wireless-dev/drivers/net/wireless/d80211/rt2x00/rt61pci.c
@@ -2285,6 +2285,14 @@ static void rt61pci_rxdone(void *data)
rt2x00dev->rx_params.ssi =
rt2x00_get_field32(rxd->word1, RXD_W1_RSSI);
+/* 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. */
+
+ rt2x00dev->rx_params.noise = -85; /* FIXME */
+ rt2x00dev->rx_params.signal =
+ rt2x00dev->rx_params.ssi - RT2X00_RX_MAX_SSI;
/* FIXME */
+
__ieee80211_rx(ring->net_dev,
skb, &rt2x00dev->rx_params);
@@ -3255,6 +3263,7 @@ static int rt61pci_init_hw(struct rt2x00
hw->device_strips_mic = 0;
hw->monitor_during_oper = 1;
hw->fraglist = 0;
+ hw->maxssi = RT2X00_RX_MAX_SSI;
/*
* We have full WMM capabilities.
Index: wireless-dev/drivers/net/wireless/d80211/rt2x00/rt73usb.c
===================================================================
--- wireless-dev.orig/drivers/net/wireless/d80211/rt2x00/rt73usb.c
+++ wireless-dev/drivers/net/wireless/d80211/rt2x00/rt73usb.c
@@ -1917,6 +1917,14 @@ static void rt73usb_rxdone(void *data)
rt2x00dev->rx_params.ssi =
rt2x00_get_field32(rxd->word1, RXD_W1_RSSI);
+/* 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. */
+
+ rt2x00dev->rx_params.noise = -85; /* FIXME */
+ rt2x00dev->rx_params.signal =
+ rt2x00dev->rx_params.ssi - RT2X00_RX_MAX_SSI;
/* FIXME */
+
__ieee80211_rx(ring->net_dev,
skb, &rt2x00dev->rx_params);
@@ -2796,6 +2804,7 @@ static int rt73usb_init_hw(struct rt2x00
hw->device_strips_mic = 0;
hw->monitor_during_oper = 1;
hw->fraglist = 0;
+ hw->maxssi = RT2X00_RX_MAX_SSI;
/*
* We have full WMM capabilities.
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
