summaryrefslogtreecommitdiff
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-03-10 00:30:44 +0100
committerJohn W. Linville <linville@tuxdriver.com>2008-03-13 19:32:31 -0400
commit8ed09854073ae0a19556d4d93cf79cf368c23673 (patch)
tree94d988e89c8bec7d8c7819a6804942abadfa47d3 /drivers/net/wireless
parentf0e62e46c3cace185eed10ebf53ef060ba6d7bb1 (diff)
rt2x00: Only strip preamble bit in rt2400pci
Only rt2400pci can have the preamble bit set in the PLCP value, for all other drivers it should not be cleared since that will conflict with the plcp values for OFDM rates. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/rt2x00/rt2400pci.c5
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00dev.c7
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,
/*
* Obtain the status about this packet.
- * The signal is the PLCP value.
+ * The signal is the PLCP value, and needs to be stripped
+ * of the preamble bit (0x08).
*/
- rxdesc->signal = rt2x00_get_field32(word2, RXD_W2_SIGNAL);
+ rxdesc->signal = rt2x00_get_field32(word2, RXD_W2_SIGNAL) & ~0x08;
rxdesc->signal_plcp = 1;
rxdesc->rssi = rt2x00_get_field32(word2, RXD_W3_RSSI) -
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,
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];