openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Johannes Berg 2012-07-24 17:35:57 +02:00 committed by John W. Linville
parent caacf05e5a
commit 858a455ba8
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/wireless/brcm80211/brcmsmac/main.c
View File

@ -7512,15 +7512,10 @@ prep_mac80211_status(struct brcms_c_info *wlc, struct d11rxhdr *rxh,
channel = BRCMS_CHAN_CHANNEL(rxh->RxChan); channel = BRCMS_CHAN_CHANNEL(rxh->RxChan);
if (channel > 14) { rx_status->band =
rx_status->band = IEEE80211_BAND_5GHZ; channel > 14 ? IEEE80211_BAND_5GHZ : IEEE80211_BAND_2GHZ;
rx_status->freq = ieee80211_ofdm_chan_to_freq( rx_status->freq =
WF_CHAN_FACTOR_5_G/2, channel); ieee80211_channel_to_frequency(channel, rx_status->band);
} else {
rx_status->band = IEEE80211_BAND_2GHZ;
rx_status->freq = ieee80211_dsss_chan_to_freq(channel);
}
rx_status->signal = wlc_phy_rssi_compute(wlc->hw->band->pi, rxh); rx_status->signal = wlc_phy_rssi_compute(wlc->hw->band->pi, rxh);

5
drivers/net/wireless/brcm80211/include/brcmu_wifi.h
View File

@ -67,11 +67,6 @@
#define WL_CHANSPEC_BAND_2G 0x2000 #define WL_CHANSPEC_BAND_2G 0x2000
#define INVCHANSPEC 255 #define INVCHANSPEC 255
/* used to calculate the chan_freq = chan_factor * 500Mhz + 5 * chan_number */
#define WF_CHAN_FACTOR_2_4_G 4814 /* 2.4 GHz band, 2407 MHz */
#define WF_CHAN_FACTOR_5_G 10000 /* 5 GHz band, 5000 MHz */
#define WF_CHAN_FACTOR_4_G 8000 /* 4.9 GHz band for Japan */
#define CHSPEC_CHANNEL(chspec) ((u8)((chspec) & WL_CHANSPEC_CHAN_MASK)) #define CHSPEC_CHANNEL(chspec) ((u8)((chspec) & WL_CHANSPEC_CHAN_MASK))
#define CHSPEC_BAND(chspec) ((chspec) & WL_CHANSPEC_BAND_MASK) #define CHSPEC_BAND(chspec) ((chspec) & WL_CHANSPEC_BAND_MASK)