aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorGravatar ZHAO Gang <gamerh2o@gmail.com> 2014-01-18 00:17:38 +0800
committerGravatar John W. Linville <linville@tuxdriver.com> 2014-01-23 14:02:45 -0500
commit64e5acb09ca6b50c97299cff9ef51299470b29f2 (patch)
tree818435d4ecfca4590dad1dbd1ff484bf7d963f61 /drivers/net/wireless
parentmwifiex: fix wakeup on magic packet (diff)
downloadlinux-64e5acb09ca6b50c97299cff9ef51299470b29f2.tar.gz
linux-64e5acb09ca6b50c97299cff9ef51299470b29f2.tar.bz2
linux-64e5acb09ca6b50c97299cff9ef51299470b29f2.zip
b43: fix the wrong assignment of status.freq in b43_rx()
Use the right function to update frequency value. If rx skb is probe response or beacon, the wrong frequency value can cause problem that bss info can't be updated when it should be. Cc: <stable@vger.kernel.org> Fixes: 8318d78a44d4 ("cfg80211 API for channels/bitrates, mac80211 and driver conversion") Signed-off-by: ZHAO Gang <gamerh2o@gmail.com> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/b43/xmit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
index 4ae63f4ddfb2..50e5ddb12fb3 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: