From 32e98e8d746b78c47a102dcc1e085c832ce88406 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 6 Nov 2008 17:20:24 +0100 Subject: [PATCH] --- yaml --- r: 122007 b: refs/heads/master c: 1e87d68083cd073c84edb3a71fa4365d7fc092bd h: refs/heads/master i: 122005: 2ef91ac05229b486e856b4994bd94a56ad5d4028 122003: 14448f36d316f917b58389da83c5c4c4e3bc2088 121999: 68a2cd6ffa6399d9cbcf029e9539aef2d07d31b3 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/b43/xmit.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3893a2c3b7f3..2c4e9789f4f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f3704e992ee4044f8e0068e060458377004473a +refs/heads/master: 1e87d68083cd073c84edb3a71fa4365d7fc092bd diff --git a/trunk/drivers/net/wireless/b43/xmit.c b/trunk/drivers/net/wireless/b43/xmit.c index adba89b816d4..eae9b8052658 100644 --- a/trunk/drivers/net/wireless/b43/xmit.c +++ b/trunk/drivers/net/wireless/b43/xmit.c @@ -46,7 +46,6 @@ static int b43_plcp_get_bitrate_idx_cck(struct b43_plcp_hdr6 *plcp) case 0x6E: return 3; } - B43_WARN_ON(1); return -1; } @@ -73,7 +72,6 @@ static u8 b43_plcp_get_bitrate_idx_ofdm(struct b43_plcp_hdr6 *plcp, bool aphy) case 0xC: return base + 7; } - B43_WARN_ON(1); return -1; } @@ -608,6 +606,8 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) phytype == B43_PHYTYPE_A); else status.rate_idx = b43_plcp_get_bitrate_idx_cck(plcp); + if (unlikely(status.rate_idx == -1)) + goto drop; status.antenna = !!(phystat0 & B43_RX_PHYST0_ANT); /*