8 files changed, 43 insertions, 15 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index a92626bc536a..4cd284209d16 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1058,9 +1058,11 @@ static void rt2400pci_fill_rxdone(struct queue_entry *entry,
         struct queue_entry_priv_pci_rx *priv_rx = entry->priv_data;
         u32 word0;
         u32 word2;
+        u32 word3;
 
         rt2x00_desc_read(priv_rx->desc, 0, &word0);
         rt2x00_desc_read(priv_rx->desc, 2, &word2);
+        rt2x00_desc_read(priv_rx->desc, 3, &word3);
 
         rxdesc->flags = 0;
         if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR))
@@ -1070,9 +1072,11 @@ static void rt2400pci_fill_rxdone(struct queue_entry *entry,
 
         /*
          * Obtain the status about this packet.
+         * The signal is the PLCP value.
          */
         rxdesc->signal = rt2x00_get_field32(word2, RXD_W2_SIGNAL);
-        rxdesc->rssi = rt2x00_get_field32(word2, RXD_W2_RSSI) -
+        rxdesc->signal_plcp = 1;
+        rxdesc->rssi = rt2x00_get_field32(word2, RXD_W3_RSSI) -
             entry->queue->rt2x00dev->rssi_offset;
         rxdesc->ofdm = 0;
         rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.h b/drivers/net/wireless/rt2x00/rt2400pci.h
index da178d44660e..a5210f9a3360 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.h
+++ b/drivers/net/wireless/rt2x00/rt2400pci.h
@@ -899,13 +899,13 @@
  * Word2
  */
 #define RXD_W2_BUFFER_LENGTH            FIELD32(0x0000ffff)
-#define RXD_W2_SIGNAL                   FIELD32(0x00ff0000)
-#define RXD_W2_RSSI                     FIELD32(0xff000000)
+#define RXD_W2_BBR0                     FIELD32(0x00ff0000)
+#define RXD_W2_SIGNAL                   FIELD32(0xff000000)
 
 /*
  * Word3
  */
-#define RXD_W3_BBR2                     FIELD32(0x000000ff)
+#define RXD_W3_RSSI                     FIELD32(0x000000ff)
 #define RXD_W3_BBR3                     FIELD32(0x0000ff00)
 #define RXD_W3_BBR4                     FIELD32(0x00ff0000)
 #define RXD_W3_BBR5                     FIELD32(0xff000000)
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 4ae09b418704..0f5139a2f238 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1219,10 +1219,17 @@ static void rt2500pci_fill_rxdone(struct queue_entry *entry,
         if (rt2x00_get_field32(word0, RXD_W0_PHYSICAL_ERROR))
                 rxdesc->flags |= RX_FLAG_FAILED_PLCP_CRC;
 
+        /*
+         * Obtain the status about this packet.
+         * When frame was received with an OFDM bitrate,
+         * the signal is the PLCP value. If it was received with
+         * a CCK bitrate the signal is the rate in 100kbit/s.
+         */
+        rxdesc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
         rxdesc->signal = rt2x00_get_field32(word2, RXD_W2_SIGNAL);
+        rxdesc->signal_plcp = rxdesc->ofdm;
         rxdesc->rssi = rt2x00_get_field32(word2, RXD_W2_RSSI) -
             entry->queue->rt2x00dev->rssi_offset;
-        rxdesc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
         rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
         rxdesc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
 }
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 8dfebfd695de..c8216d755835 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1135,11 +1135,15 @@ static void rt2500usb_fill_rxdone(struct queue_entry *entry,
 
         /*
          * Obtain the status about this packet.
+         * When frame was received with an OFDM bitrate,
+         * the signal is the PLCP value. If it was received with
+         * a CCK bitrate the signal is the rate in 100kbit/s.
          */
+        rxdesc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
         rxdesc->signal = rt2x00_get_field32(word1, RXD_W1_SIGNAL);
+        rxdesc->signal_plcp = rxdesc->ofdm;
         rxdesc->rssi = rt2x00_get_field32(word1, RXD_W1_RSSI) -
             entry->queue->rt2x00dev->rssi_offset;
-        rxdesc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
         rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
         rxdesc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index eb2d21c4e8e9..a885254d2e85 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -574,19 +574,21 @@ void rt2x00lib_rxdone(struct queue_entry *entry,
         u16 fc;
 
         /*
+         * If the signal is the plcp value,
+         * we need to strip the preamble bit (0x08).
+         */
+        if (rxdesc->signal_plcp)
+                rxdesc->signal &= ~0x08;
+
+        /*
          * Update RX statistics.
          */
         sband = &rt2x00dev->bands[rt2x00dev->curr_band];
         for (i = 0; i < sband->n_bitrates; i++) {
                 rate = rt2x00_get_rate(sband->bitrates[i].hw_value);
 
-                /*
-                 * When frame was received with an OFDM bitrate,
-                 * the signal is the PLCP value. If it was received with
-                 * a CCK bitrate the signal is the rate in 100kbit/s.
-                 */
-                if ((rxdesc->ofdm && rate->plcp == rxdesc->signal) ||
-                    (!rxdesc->ofdm && rate->bitrate == rxdesc->signal)) {
+                if ((rxdesc->signal_plcp && rate->plcp == rxdesc->signal) ||
+                    (!rxdesc->signal_plcp && rate->bitrate == rxdesc->signal)) {
                         idx = i;
                         break;
                 }
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h
index fbabf389b622..c5f46f234083 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.h
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
@@ -134,6 +134,8 @@ static inline struct skb_frame_desc* get_skb_frame_desc(struct sk_buff *skb)
  * Summary of information that has been read from the RX frame descriptor.
  *
  * @signal: Signal of the received frame.
+ * @signal_plcp: Does the signal field contain the plcp value,
+ *      or does it contain the bitrate itself.
  * @rssi: RSSI of the received frame.
  * @ofdm: Was frame send with an OFDM rate.
  * @size: Data size of the received frame.
@@ -142,6 +144,7 @@ static inline struct skb_frame_desc* get_skb_frame_desc(struct sk_buff *skb)
  */
 struct rxdone_entry_desc {
         int signal;
+        int signal_plcp;
         int rssi;
         int ofdm;
         int size;
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 914aee0ce8ce..4baa916b80cf 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -1645,10 +1645,14 @@ static void rt61pci_fill_rxdone(struct queue_entry *entry,
 
         /*
          * Obtain the status about this packet.
+         * When frame was received with an OFDM bitrate,
+         * the signal is the PLCP value. If it was received with
+         * a CCK bitrate the signal is the rate in 100kbit/s.
          */
+        rxdesc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
         rxdesc->signal = rt2x00_get_field32(word1, RXD_W1_SIGNAL);
+        rxdesc->signal_plcp = rxdesc->ofdm;
         rxdesc->rssi = rt61pci_agc_to_rssi(entry->queue->rt2x00dev, word1);
-        rxdesc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
         rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
         rxdesc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
 }
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index fc38c0c5cc3a..48938819ee2f 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1405,10 +1405,14 @@ static void rt73usb_fill_rxdone(struct queue_entry *entry,
 
         /*
          * Obtain the status about this packet.
+         * When frame was received with an OFDM bitrate,
+         * the signal is the PLCP value. If it was received with
+         * a CCK bitrate the signal is the rate in 100kbit/s.
          */
+        rxdesc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
         rxdesc->signal = rt2x00_get_field32(word1, RXD_W1_SIGNAL);
+        rxdesc->signal_plcp = rxdesc->ofdm;
         rxdesc->rssi = rt73usb_agc_to_rssi(entry->queue->rt2x00dev, word1);
-        rxdesc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
         rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
         rxdesc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);