1 files changed, 9 insertions, 7 deletions

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;
                 }