Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Zhao, Gang and committed by
John W. Linville
de5356e6 61e5487b

+3 -2
+3 -2
drivers/net/wireless/wl3501_cs.c
··· 42 42 #include <linux/slab.h> 43 43 #include <linux/string.h> 44 44 #include <linux/wireless.h> 45 - #include <linux/ieee80211.h> 45 + #include <net/cfg80211.h> 46 46 47 47 #include <net/iw_handler.h> 48 48 ··· 1453 1453 { 1454 1454 struct wl3501_card *this = netdev_priv(dev); 1455 1455 1456 - wrqu->freq.m = ieee80211_dsss_chan_to_freq(this->chan) * 100000; 1456 + wrqu->freq.m = 100000 * 1457 + ieee80211_channel_to_frequency(this->chan, IEEE80211_BAND_2GHZ); 1457 1458 wrqu->freq.e = 1; 1458 1459 return 0; 1459 1460 }