diff options
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/rx.c')
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/rx.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c index a944893ae3ca..9a57cf6a488f 100644 --- a/drivers/net/wireless/iwmc3200wifi/rx.c +++ b/drivers/net/wireless/iwmc3200wifi/rx.c | |||
@@ -543,7 +543,10 @@ static int iwm_mlme_assoc_complete(struct iwm_priv *iwm, u8 *buf, | |||
543 | switch (le32_to_cpu(complete->status)) { | 543 | switch (le32_to_cpu(complete->status)) { |
544 | case UMAC_ASSOC_COMPLETE_SUCCESS: | 544 | case UMAC_ASSOC_COMPLETE_SUCCESS: |
545 | chan = ieee80211_get_channel(wiphy, | 545 | chan = ieee80211_get_channel(wiphy, |
546 | ieee80211_channel_to_frequency(complete->channel)); | 546 | ieee80211_channel_to_frequency(complete->channel, |
547 | complete->band == UMAC_BAND_2GHZ ? | ||
548 | IEEE80211_BAND_2GHZ : | ||
549 | IEEE80211_BAND_5GHZ)); | ||
547 | if (!chan || chan->flags & IEEE80211_CHAN_DISABLED) { | 550 | if (!chan || chan->flags & IEEE80211_CHAN_DISABLED) { |
548 | /* Associated to a unallowed channel, disassociate. */ | 551 | /* Associated to a unallowed channel, disassociate. */ |
549 | __iwm_invalidate_mlme_profile(iwm); | 552 | __iwm_invalidate_mlme_profile(iwm); |
@@ -841,7 +844,7 @@ static int iwm_mlme_update_bss_table(struct iwm_priv *iwm, u8 *buf, | |||
841 | goto err; | 844 | goto err; |
842 | } | 845 | } |
843 | 846 | ||
844 | freq = ieee80211_channel_to_frequency(umac_bss->channel); | 847 | freq = ieee80211_channel_to_frequency(umac_bss->channel, band->band); |
845 | channel = ieee80211_get_channel(wiphy, freq); | 848 | channel = ieee80211_get_channel(wiphy, freq); |
846 | signal = umac_bss->rssi * 100; | 849 | signal = umac_bss->rssi * 100; |
847 | 850 | ||