diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2008-03-25 09:12:45 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-03-25 16:42:00 -0400 |
commit | 866a05038481d77cac6fc0186250b4c44e691b42 (patch) | |
tree | b3fbc8285add39912effb4e67f33e5435e67a86f /drivers/net/wireless/rt2x00/rt2x00dev.c | |
parent | 49d20fac21d5207f3930401d0198ac46ad990bff (diff) |
rt2x00: Fix rate detection for invalid signals
It has been observed on rt2500pci hardware that some
frames received with signal 0x0C do not have the OFDM
flag set.
Signals can have 2 meanings:
1) The PLCP value
2) The bitrate * 10
For rt2500pci (1) is for frames received with a OFDM rate,
and (2) is for frames received with a CCK rate.
But 0x0C is a invalid bitrate value but is a valid PLCP
value for 54Mbs (obvious OFDM rate).
This means that it is possible that the hardware does not
set the OFDM bit correctly under all circumstances.
This results in rt2x00 failing to detect the rate and
mac80211 triggering a WARN_ON() and dropping the frame.
To bypass this, print a warning when such a frame is received,
and reset the rate to the lowest supported rate for the current band.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00dev.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 4fd0c25aebf3..f52e92512f90 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
@@ -589,6 +589,13 @@ void rt2x00lib_rxdone(struct queue_entry *entry, | |||
589 | } | 589 | } |
590 | } | 590 | } |
591 | 591 | ||
592 | if (idx < 0) { | ||
593 | WARNING(rt2x00dev, "Frame received with unrecognized signal," | ||
594 | "signal=0x%.2x, plcp=%d.\n", rxdesc->signal, | ||
595 | !!(rxdesc->dev_flags & RXDONE_SIGNAL_PLCP)); | ||
596 | idx = 0; | ||
597 | } | ||
598 | |||
592 | /* | 599 | /* |
593 | * Only update link status if this is a beacon frame carrying our bssid. | 600 | * Only update link status if this is a beacon frame carrying our bssid. |
594 | */ | 601 | */ |