diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/b43/xmit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c index adba89b816d4..eae9b8052658 100644 --- a/drivers/net/wireless/b43/xmit.c +++ b/drivers/net/wireless/b43/xmit.c | |||
@@ -46,7 +46,6 @@ static int b43_plcp_get_bitrate_idx_cck(struct b43_plcp_hdr6 *plcp) | |||
46 | case 0x6E: | 46 | case 0x6E: |
47 | return 3; | 47 | return 3; |
48 | } | 48 | } |
49 | B43_WARN_ON(1); | ||
50 | return -1; | 49 | return -1; |
51 | } | 50 | } |
52 | 51 | ||
@@ -73,7 +72,6 @@ static u8 b43_plcp_get_bitrate_idx_ofdm(struct b43_plcp_hdr6 *plcp, bool aphy) | |||
73 | case 0xC: | 72 | case 0xC: |
74 | return base + 7; | 73 | return base + 7; |
75 | } | 74 | } |
76 | B43_WARN_ON(1); | ||
77 | return -1; | 75 | return -1; |
78 | } | 76 | } |
79 | 77 | ||
@@ -608,6 +606,8 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) | |||
608 | phytype == B43_PHYTYPE_A); | 606 | phytype == B43_PHYTYPE_A); |
609 | else | 607 | else |
610 | status.rate_idx = b43_plcp_get_bitrate_idx_cck(plcp); | 608 | status.rate_idx = b43_plcp_get_bitrate_idx_cck(plcp); |
609 | if (unlikely(status.rate_idx == -1)) | ||
610 | goto drop; | ||
611 | status.antenna = !!(phystat0 & B43_RX_PHYST0_ANT); | 611 | status.antenna = !!(phystat0 & B43_RX_PHYST0_ANT); |
612 | 612 | ||
613 | /* | 613 | /* |