Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2 files changed, 7 insertions, 3 deletions

diff --git a/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
index 5a4982271e96..ed57e4402800 100644
--- a/drivers/net/wireless/iwmc3200wifi/cfg80211.c
+++ b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
@@ -287,7 +287,8 @@ int iwm_cfg80211_inform_bss(struct iwm_priv *iwm)
                         return -EINVAL;
                 }
 
-                freq = ieee80211_channel_to_frequency(umac_bss->channel);
+                freq = ieee80211_channel_to_frequency(umac_bss->channel,
+                                                      band->band);
                 channel = ieee80211_get_channel(wiphy, freq);
                 signal = umac_bss->rssi * 100;
 
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,
         switch (le32_to_cpu(complete->status)) {
         case UMAC_ASSOC_COMPLETE_SUCCESS:
                 chan = ieee80211_get_channel(wiphy,
-                        ieee80211_channel_to_frequency(complete->channel));
+                        ieee80211_channel_to_frequency(complete->channel,
+                                complete->band == UMAC_BAND_2GHZ ?
+                                        IEEE80211_BAND_2GHZ :
+                                        IEEE80211_BAND_5GHZ));
                 if (!chan || chan->flags & IEEE80211_CHAN_DISABLED) {
                         /* Associated to a unallowed channel, disassociate. */
                         __iwm_invalidate_mlme_profile(iwm);
@@ -841,7 +844,7 @@ static int iwm_mlme_update_bss_table(struct iwm_priv *iwm, u8 *buf,
                 goto err;
         }
 
-        freq = ieee80211_channel_to_frequency(umac_bss->channel);
+        freq = ieee80211_channel_to_frequency(umac_bss->channel, band->band);
         channel = ieee80211_get_channel(wiphy, freq);
         signal = umac_bss->rssi * 100;