diff options
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2400pci.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c index 4cd284209d16..1f49561d3ddc 100644 --- a/drivers/net/wireless/rt2x00/rt2400pci.c +++ b/drivers/net/wireless/rt2x00/rt2400pci.c | |||
@@ -1072,9 +1072,10 @@ static void rt2400pci_fill_rxdone(struct queue_entry *entry, | |||
1072 | 1072 | ||
1073 | /* | 1073 | /* |
1074 | * Obtain the status about this packet. | 1074 | * Obtain the status about this packet. |
1075 | * The signal is the PLCP value. | 1075 | * The signal is the PLCP value, and needs to be stripped |
1076 | * of the preamble bit (0x08). | ||
1076 | */ | 1077 | */ |
1077 | rxdesc->signal = rt2x00_get_field32(word2, RXD_W2_SIGNAL); | 1078 | rxdesc->signal = rt2x00_get_field32(word2, RXD_W2_SIGNAL) & ~0x08; |
1078 | rxdesc->signal_plcp = 1; | 1079 | rxdesc->signal_plcp = 1; |
1079 | rxdesc->rssi = rt2x00_get_field32(word2, RXD_W3_RSSI) - | 1080 | rxdesc->rssi = rt2x00_get_field32(word2, RXD_W3_RSSI) - |
1080 | entry->queue->rt2x00dev->rssi_offset; | 1081 | entry->queue->rt2x00dev->rssi_offset; |
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index a885254d2e85..b81efc9b058d 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
@@ -574,13 +574,6 @@ void rt2x00lib_rxdone(struct queue_entry *entry, | |||
574 | u16 fc; | 574 | u16 fc; |
575 | 575 | ||
576 | /* | 576 | /* |
577 | * If the signal is the plcp value, | ||
578 | * we need to strip the preamble bit (0x08). | ||
579 | */ | ||
580 | if (rxdesc->signal_plcp) | ||
581 | rxdesc->signal &= ~0x08; | ||
582 | |||
583 | /* | ||
584 | * Update RX statistics. | 577 | * Update RX statistics. |
585 | */ | 578 | */ |
586 | sband = &rt2x00dev->bands[rt2x00dev->curr_band]; | 579 | sband = &rt2x00dev->bands[rt2x00dev->curr_band]; |