Commit b17696db authored by ZHAO Gang's avatar ZHAO Gang Committed by Greg Kroah-Hartman

b43: fix the wrong assignment of status.freq in b43_rx()

commit 64e5acb0 upstream.

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.

Fixes: 8318d78a ("cfg80211 API for channels/bitrates, mac80211 and driver conversion")
Signed-off-by: default avatarZHAO Gang <gamerh2o@gmail.com>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 06600864
...@@ -819,10 +819,10 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) ...@@ -819,10 +819,10 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
* channel number in b43. */ * channel number in b43. */
if (chanstat & B43_RX_CHAN_5GHZ) { if (chanstat & B43_RX_CHAN_5GHZ) {
status.band = IEEE80211_BAND_5GHZ; status.band = IEEE80211_BAND_5GHZ;
status.freq = b43_freq_to_channel_5ghz(chanid); status.freq = b43_channel_to_freq_5ghz(chanid);
} else { } else {
status.band = IEEE80211_BAND_2GHZ; status.band = IEEE80211_BAND_2GHZ;
status.freq = b43_freq_to_channel_2ghz(chanid); status.freq = b43_channel_to_freq_2ghz(chanid);
} }
break; break;
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment