diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-07-24 17:35:57 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-08-06 14:56:29 -0400 |
| commit | 858a455ba86b0b515d34972e68095ecd912c08cc (patch) | |
| tree | a38c2f2ef1bf5308757394f3823e020a12e2f4e8 /drivers/net/wireless/brcm80211/brcmsmac | |
| parent | caacf05e5ad1abf0a2864863da4e33024bc68ec6 (diff) | |
| download | op-kernel-dev-858a455ba86b0b515d34972e68095ecd912c08cc.zip op-kernel-dev-858a455ba86b0b515d34972e68095ecd912c08cc.tar.gz | |
brcmsmac: use ieee80211_channel_to_frequency
Instead of hard-coding almost the same functionality,
just use ieee80211_channel_to_frequency() directly.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/main.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c index 03ca653..75086b3 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c @@ -7512,15 +7512,10 @@ prep_mac80211_status(struct brcms_c_info *wlc, struct d11rxhdr *rxh, channel = BRCMS_CHAN_CHANNEL(rxh->RxChan); - if (channel > 14) { - rx_status->band = IEEE80211_BAND_5GHZ; - rx_status->freq = ieee80211_ofdm_chan_to_freq( - WF_CHAN_FACTOR_5_G/2, channel); - - } else { - rx_status->band = IEEE80211_BAND_2GHZ; - rx_status->freq = ieee80211_dsss_chan_to_freq(channel); - } + rx_status->band = + channel > 14 ? IEEE80211_BAND_5GHZ : IEEE80211_BAND_2GHZ; + rx_status->freq = + ieee80211_channel_to_frequency(channel, rx_status->band); rx_status->signal = wlc_phy_rssi_compute(wlc->hw->band->pi, rxh); |
