rt2x00: remove now unused noise field from struct rxdone_entry_desc

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>

diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 0e52f174896c5cdf5805cbcace8f5186e08b7f47..89281d78f04db00f650c75396c63cb81f91ba511 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -895,10 +895,6 @@ static void rt2800pci_fill_rxdone(struct queue_entry *entry,
            (rt2x00_get_field32(rxwi2, RXWI_W2_RSSI0) +
             rt2x00_get_field32(rxwi2, RXWI_W2_RSSI1)) / 2;
 
-       rxdesc->noise =
-           (rt2x00_get_field32(rxwi3, RXWI_W3_SNR0) +
-            rt2x00_get_field32(rxwi3, RXWI_W3_SNR1)) / 2;
-
        rxdesc->size = rt2x00_get_field32(rxwi0, RXWI_W0_MPDU_TOTAL_BYTE_COUNT);
 
        /*

diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index a71615606c3745d04246056f606ad8bdfcf3b6b0..6f2a945cd45cee1420654eaff127496ca5c9033b 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -645,10 +645,6 @@ static void rt2800usb_fill_rxdone(struct queue_entry *entry,
            (rt2x00_get_field32(rxwi2, RXWI_W2_RSSI0) +
             rt2x00_get_field32(rxwi2, RXWI_W2_RSSI1)) / 2;
 
-       rxdesc->noise =
-           (rt2x00_get_field32(rxwi3, RXWI_W3_SNR0) +
-            rt2x00_get_field32(rxwi3, RXWI_W3_SNR1)) / 2;
-
        rxdesc->size = rt2x00_get_field32(rxwi0, RXWI_W0_MPDU_TOTAL_BYTE_COUNT);
 
        /*

diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h
index c1e482bb37b36f18544d27eeaef8e41b6e1852be..f519aba4ff0ff58c86580295b0579637cc9d5f1c 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00queue.h
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
@@ -183,7 +183,6 @@ enum rxdone_entry_desc_flags {
  * @timestamp: RX Timestamp
  * @signal: Signal of the received frame.
  * @rssi: RSSI of the received frame.
- * @noise: Measured noise during frame reception.
  * @size: Data size of the received frame.
  * @flags: MAC80211 receive flags (See &enum mac80211_rx_flags).
  * @dev_flags: Ralink receive flags (See &enum rxdone_entry_desc_flags).
@@ -197,7 +196,6 @@ struct rxdone_entry_desc {
        u64 timestamp;
        int signal;
        int rssi;
-       int noise;
        int size;
        int flags;
        int dev_flags;