1 files changed, 12 insertions, 3 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index acf4d67ba43d..f52e92512f90 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -580,19 +580,28 @@ void rt2x00lib_rxdone(struct queue_entry *entry,
         for (i = 0; i < sband->n_bitrates; i++) {
                 rate = rt2x00_get_rate(sband->bitrates[i].hw_value);
 
-                if ((rxdesc->signal_plcp && rate->plcp == rxdesc->signal) ||
-                    (!rxdesc->signal_plcp && rate->bitrate == rxdesc->signal)) {
+                if (((rxdesc->dev_flags & RXDONE_SIGNAL_PLCP) &&
+                     (rate->plcp == rxdesc->signal)) ||
+                    (!(rxdesc->dev_flags & RXDONE_SIGNAL_PLCP) &&
+                      (rate->bitrate == rxdesc->signal))) {
                         idx = i;
                         break;
                 }
         }
 
+        if (idx < 0) {
+                WARNING(rt2x00dev, "Frame received with unrecognized signal,"
+                        "signal=0x%.2x, plcp=%d.\n", rxdesc->signal,
+                        !!(rxdesc->dev_flags & RXDONE_SIGNAL_PLCP));
+                idx = 0;
+        }
+
         /*
          * Only update link status if this is a beacon frame carrying our bssid.
          */
         hdr = (struct ieee80211_hdr *)entry->skb->data;
         fc = le16_to_cpu(hdr->frame_control);
-        if (is_beacon(fc) && rxdesc->my_bss)
+        if (is_beacon(fc) && (rxdesc->dev_flags & RXDONE_MY_BSS))
                 rt2x00lib_update_link_stats(&rt2x00dev->link, rxdesc->rssi);
 
         rt2x00dev->link.qual.rx_success++;