summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorZhao, Gang <gamerh2o@gmail.com>2014-02-18 14:36:00 +0100
committerJohn W. Linville <linville@tuxdriver.com>2014-02-28 20:12:36 +0100
commit3a11af8aadc5a7bf9b4cdec6424869b1017b452e (patch)
tree6ecbd790ccaeb8f677f62361aeac8416c68ada69 /drivers/net
parentwl3501_cs: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} (diff)
downloadlinux-3a11af8aadc5a7bf9b4cdec6424869b1017b452e.tar.xz
linux-3a11af8aadc5a7bf9b4cdec6424869b1017b452e.zip
rndis_wlan: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}
Replace ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} with more generic ieee80211_{channel_to_frequency, frequency_to_channel}. File <net/cfg80211.h> has already been included. It's safe to use IEEE80211_BAND_2GHZ here. This change is a preparation for the removal of function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}. Cc: Jussi Kivilinna <jussi.kivilinna@iki.fi> Signed-off-by: Zhao, Gang <gamerh2o@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/rndis_wlan.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 2e89a865a67d..39d22a154341 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -1290,7 +1290,8 @@ static int set_channel(struct usbnet *usbdev, int channel)
if (is_associated(usbdev))
return 0;
- dsconfig = ieee80211_dsss_chan_to_freq(channel) * 1000;
+ dsconfig = 1000 *
+ ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
len = sizeof(config);
ret = rndis_query_oid(usbdev,