| From bf2d225b466496ff6704288bbd79fe744b399811 Mon Sep 17 00:00:00 2001 |
| From: Lorenzo Nava <navalorenx@gmail.com> |
| Date: Sat, 28 Mar 2009 01:45:06 +0000 |
| Subject: b43: fix b43_plcp_get_bitrate_idx_ofdm return type |
| |
| From: Lorenzo Nava <navalorenx@gmail.com> |
| |
| upstream commit: a3c0b87c4f21911fb7185902dd13f0e3cd7f33f7 |
| |
| This patch fixes the return type of b43_plcp_get_bitrate_idx_ofdm. If |
| the plcp contains an error, the function return value is 255 instead |
| of -1, and the packet was not dropped. This causes a warning in |
| __ieee80211_rx function because rate idx is out of range. |
| |
| Signed-off-by: Lorenzo Nava <navalorenx@gmail.com> |
| Signed-off-by: Michael Buesch <mb@bu3sch.de> |
| Signed-off-by: John W. Linville <linville@tuxdriver.com> |
| Signed-off-by: Chris Wright <chrisw@sous-sol.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| drivers/net/wireless/b43/xmit.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/net/wireless/b43/xmit.c |
| +++ b/drivers/net/wireless/b43/xmit.c |
| @@ -51,7 +51,7 @@ static int b43_plcp_get_bitrate_idx_cck( |
| } |
| |
| /* Extract the bitrate index out of an OFDM PLCP header. */ |
| -static u8 b43_plcp_get_bitrate_idx_ofdm(struct b43_plcp_hdr6 *plcp, bool aphy) |
| +static int b43_plcp_get_bitrate_idx_ofdm(struct b43_plcp_hdr6 *plcp, bool aphy) |
| { |
| int base = aphy ? 0 : 4; |
| |
