[PATCH v3 1/2] b43: fix the wrong assignment of status.freq in b43_rx()

ZHAO Gang gamerh2o at gmail.com
Fri Jan 17 10:19:13 EST 2014


Use the right function to update status.freq. The wrong frequency
value can cause problem that bss info can't be updated when it
should be.

This bug is introduced by commit 8318d78a44d49ac1edf2bdec7299de3617c4232e
"cfg80211 API for channels/bitrates, mac80211 and driver conversion".

Cc: Stable <stable at vger.kernel.org>
Signed-off-by: ZHAO Gang <gamerh2o at gmail.com>
---
v3: change commit log
    suggested by Luca Coelho, Rafał Miłecki and Jonas Gorski

I'm not very familiar with wireless subsystem yet. If commit message needs
more changes, feel free to point it out.

 drivers/net/wireless/b43/xmit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
index 4ae63f4..50e5ddb 100644
--- a/drivers/net/wireless/b43/xmit.c
+++ b/drivers/net/wireless/b43/xmit.c
@@ -821,10 +821,10 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
 		 * channel number in b43. */
 		if (chanstat & B43_RX_CHAN_5GHZ) {
 			status.band = IEEE80211_BAND_5GHZ;
-			status.freq = b43_freq_to_channel_5ghz(chanid);
+			status.freq = b43_channel_to_freq_5ghz(chanid);
 		} else {
 			status.band = IEEE80211_BAND_2GHZ;
-			status.freq = b43_freq_to_channel_2ghz(chanid);
+			status.freq = b43_channel_to_freq_2ghz(chanid);
 		}
 		break;
 	default:
-- 
1.8.4.2




More information about the b43-dev mailing list