aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/orinoco/scan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/orinoco/scan.c')
-rw-r--r--drivers/net/wireless/orinoco/scan.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/orinoco/scan.c b/drivers/net/wireless/orinoco/scan.c
index e8c5714bfd11..e175b9b8561b 100644
--- a/drivers/net/wireless/orinoco/scan.c
+++ b/drivers/net/wireless/orinoco/scan.c
@@ -110,7 +110,8 @@ static void orinoco_add_hostscan_result(struct orinoco_private *priv,
110 break; 110 break;
111 } 111 }
112 112
113 freq = ieee80211_dsss_chan_to_freq(le16_to_cpu(bss->a.channel)); 113 freq = ieee80211_channel_to_frequency(
114 le16_to_cpu(bss->a.channel), IEEE80211_BAND_2GHZ);
114 channel = ieee80211_get_channel(wiphy, freq); 115 channel = ieee80211_get_channel(wiphy, freq);
115 if (!channel) { 116 if (!channel) {
116 printk(KERN_DEBUG "Invalid channel designation %04X(%04X)", 117 printk(KERN_DEBUG "Invalid channel designation %04X(%04X)",
@@ -146,7 +147,7 @@ void orinoco_add_extscan_result(struct orinoco_private *priv,
146 ie_len = len - sizeof(*bss); 147 ie_len = len - sizeof(*bss);
147 ie = cfg80211_find_ie(WLAN_EID_DS_PARAMS, bss->data, ie_len); 148 ie = cfg80211_find_ie(WLAN_EID_DS_PARAMS, bss->data, ie_len);
148 chan = ie ? ie[2] : 0; 149 chan = ie ? ie[2] : 0;
149 freq = ieee80211_dsss_chan_to_freq(chan); 150 freq = ieee80211_channel_to_frequency(chan, IEEE80211_BAND_2GHZ);
150 channel = ieee80211_get_channel(wiphy, freq); 151 channel = ieee80211_get_channel(wiphy, freq);
151 152
152 timestamp = le64_to_cpu(bss->timestamp); 153 timestamp = le64_to_cpu(bss->timestamp);