renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-05 20:24:09 +08:00
Code

mac80211: don't check rates on PLCP error frames

Browse Source 
Frames that failed PLCP error checks are most likely
microwave transmissions (well, maybe not ...) and
don't have a proper rate detected, so ignore it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2010-07-30 13:23:12 +02:00 committed by John W. Linville
parent 86df5f7284
commit fc88518916
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
net/mac80211/rx.c
View File

@ -2615,28 +2615,37 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
if (WARN_ON(!local->started)) if (WARN_ON(!local->started))
goto drop; goto drop;
if (status->flag & RX_FLAG_HT) { if (likely(!(status->flag & RX_FLAG_FAILED_PLCP_CRC))) {
/* /*
* rate_idx is MCS index, which can be [0-76] as documented on: * Validate the rate, unless a PLCP error means that
* * we probably can't have a valid rate here anyway.
* http://wireless.kernel.org/en/developers/Documentation/ieee80211/802.11n
*
* Anything else would be some sort of driver or hardware error.
* The driver should catch hardware errors.
*/ */
if (WARN((status->rate_idx < 0 ||
status->rate_idx > 76), if (status->flag & RX_FLAG_HT) {
"Rate marked as an HT rate but passed " /*
"status->rate_idx is not " * rate_idx is MCS index, which can be [0-76]
"an MCS index [0-76]: %d (0x%02x)\n", * as documented on:
status->rate_idx, *
status->rate_idx)) * http://wireless.kernel.org/en/developers/Documentation/ieee80211/802.11n
goto drop; *
} else { * Anything else would be some sort of driver or
if (WARN_ON(status->rate_idx < 0 || * hardware error. The driver should catch hardware
status->rate_idx >= sband->n_bitrates)) * errors.
goto drop; */
rate = &sband->bitrates[status->rate_idx]; if (WARN((status->rate_idx < 0 ||
status->rate_idx > 76),
"Rate marked as an HT rate but passed "
"status->rate_idx is not "
"an MCS index [0-76]: %d (0x%02x)\n",
status->rate_idx,
status->rate_idx))
goto drop;
} else {
if (WARN_ON(status->rate_idx < 0 ||
status->rate_idx >= sband->n_bitrates))
goto drop;
rate = &sband->bitrates[status->rate_idx];
}
} }
/* /*