diff options
| author | Zhao, Gang <gamerh2o@gmail.com> | 2014-02-18 21:36:01 +0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-28 14:12:36 -0500 |
| commit | 3d54b9052c08a473f56cbed6a0bb4c900c948474 (patch) | |
| tree | 2e642084f6dda5592511302c036f6668452c3926 /drivers/net/wireless/zd1201.c | |
| parent | 3a11af8aadc5a7bf9b4cdec6424869b1017b452e (diff) | |
| download | op-kernel-dev-3d54b9052c08a473f56cbed6a0bb4c900c948474.zip op-kernel-dev-3d54b9052c08a473f56cbed6a0bb4c900c948474.tar.gz | |
zd1201: 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}.
Function ieee80211_frequency_to_channel() will return 0 if frequency
is not correctly provided, so no need to set channel to 0 explicitly.
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}.
Signed-off-by: Zhao, Gang <gamerh2o@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/zd1201.c')
| -rw-r--r-- | drivers/net/wireless/zd1201.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c index d39c417..6f5c793 100644 --- a/drivers/net/wireless/zd1201.c +++ b/drivers/net/wireless/zd1201.c @@ -18,7 +18,7 @@ #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/wireless.h> -#include <linux/ieee80211.h> +#include <net/cfg80211.h> #include <net/iw_handler.h> #include <linux/string.h> #include <linux/if_arp.h> @@ -914,11 +914,8 @@ static int zd1201_set_freq(struct net_device *dev, if (freq->e == 0) channel = freq->m; - else { - channel = ieee80211_freq_to_dsss_chan(freq->m); - if (channel < 0) - channel = 0; - } + else + channel = ieee80211_frequency_to_channel(freq->m); err = zd1201_setconfig16(zd, ZD1201_RID_CNFOWNCHANNEL, channel); if (err) |
