summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl3501_cs.c
diff options
context:
space:
mode:
authorZhao, Gang <gamerh2o@gmail.com>2014-02-18 21:35:59 +0800
committerJohn W. Linville <linville@tuxdriver.com>2014-02-28 14:12:36 -0500
commitde5356e6aad65405952f7057802c576c1268fb4b (patch)
tree562bb194f28f142bbd2531144d02e0b4db68639d /drivers/net/wireless/wl3501_cs.c
parent61e5487b34d3831fcc0db1308643f4a5dc465ae1 (diff)
downloadlinux-de5356e6aad65405952f7057802c576c1268fb4b.tar.gz
linux-de5356e6aad65405952f7057802c576c1268fb4b.tar.bz2
linux-de5356e6aad65405952f7057802c576c1268fb4b.zip
wl3501_cs: 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}. Include <net/cfg80211.h> for the defination of IEEE80211_BAND_2GHZ. Because <net/cfg80211.h> includes <linux/ieee80211.h>, so we can replace <linux/ieee80211.h> with <net/cfg80211.h>. This change is a preparation for the removal of function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}. Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Signed-off-by: Zhao, Gang <gamerh2o@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl3501_cs.c')
-rw-r--r--drivers/net/wireless/wl3501_cs.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 66bca677c4fa..d5c371d77ddf 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -42,7 +42,7 @@
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/wireless.h>
-#include <linux/ieee80211.h>
+#include <net/cfg80211.h>
#include <net/iw_handler.h>
@@ -1453,7 +1453,8 @@ static int wl3501_get_freq(struct net_device *dev, struct iw_request_info *info,
{
struct wl3501_card *this = netdev_priv(dev);
- wrqu->freq.m = ieee80211_dsss_chan_to_freq(this->chan) * 100000;
+ wrqu->freq.m = 100000 *
+ ieee80211_channel_to_frequency(this->chan, IEEE80211_BAND_2GHZ);
wrqu->freq.e = 1;
return 0;
}