diff options
Diffstat (limited to 'drivers/net/wireless/b43/xmit.c')
| -rw-r--r-- | drivers/net/wireless/b43/xmit.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c index 6e6ef3fc2247..426dc13c44cd 100644 --- a/drivers/net/wireless/b43/xmit.c +++ b/drivers/net/wireless/b43/xmit.c | |||
| @@ -80,9 +80,10 @@ static int b43_plcp_get_bitrate_idx_cck(struct b43_plcp_hdr6 *plcp) | |||
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | /* Extract the bitrate index out of an OFDM PLCP header. */ | 82 | /* Extract the bitrate index out of an OFDM PLCP header. */ |
| 83 | static int b43_plcp_get_bitrate_idx_ofdm(struct b43_plcp_hdr6 *plcp, bool aphy) | 83 | static int b43_plcp_get_bitrate_idx_ofdm(struct b43_plcp_hdr6 *plcp, bool ghz5) |
| 84 | { | 84 | { |
| 85 | int base = aphy ? 0 : 4; | 85 | /* For 2 GHz band first OFDM rate is at index 4, see main.c */ |
| 86 | int base = ghz5 ? 0 : 4; | ||
| 86 | 87 | ||
| 87 | switch (plcp->raw[0] & 0xF) { | 88 | switch (plcp->raw[0] & 0xF) { |
| 88 | case 0xB: | 89 | case 0xB: |
| @@ -767,7 +768,7 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) | |||
| 767 | 768 | ||
| 768 | if (phystat0 & B43_RX_PHYST0_OFDM) | 769 | if (phystat0 & B43_RX_PHYST0_OFDM) |
| 769 | rate_idx = b43_plcp_get_bitrate_idx_ofdm(plcp, | 770 | rate_idx = b43_plcp_get_bitrate_idx_ofdm(plcp, |
| 770 | phytype == B43_PHYTYPE_A); | 771 | !!(chanstat & B43_RX_CHAN_5GHZ)); |
| 771 | else | 772 | else |
| 772 | rate_idx = b43_plcp_get_bitrate_idx_cck(plcp); | 773 | rate_idx = b43_plcp_get_bitrate_idx_cck(plcp); |
| 773 | if (unlikely(rate_idx == -1)) { | 774 | if (unlikely(rate_idx == -1)) { |
