rndis_wlan: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}
authorZhao, Gang <gamerh2o@gmail.com>
Tue, 18 Feb 2014 13:36:00 +0000 (21:36 +0800)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Feb 2014 19:12:36 +0000 (14:12 -0500)
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>
drivers/net/wireless/rndis_wlan.c

index 2e89a865a67d1023d9ae64e0351c42d91c15c47e..39d22a154341019fe8038bdfa1f7e1b4cb560cf2 100644 (file)
@@ -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,