2 files changed, 7 insertions, 10 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 192ad5c1fcc8..1c70defba6c3 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -86,7 +86,9 @@ MODULE_AUTHOR("Broadcom Corporation");
 MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver.");
 MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN cards");
 MODULE_LICENSE("Dual BSD/GPL");
-
+/* This needs to be adjusted when brcms_firmwares changes */
+MODULE_FIRMWARE("brcm/bcm43xx-0.fw");
+MODULE_FIRMWARE("brcm/bcm43xx_hdr-0.fw");
 
 /* recognized BCMA Core IDs */
 static struct bcma_device_id brcms_coreid_table[] = {
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 03ca65324845..75086b37c817 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);