diff options
| author |   Zhao, Gang <gamerh2o@gmail.com> | 2014-02-19 16:58:43 +0800 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2014-02-28 14:12:36 -0500 |
| commit | 13c1ac5703d5507da9422377819d5d1e4e550173 (patch) | |
| tree | 392ed27d0fc5cd6057759d5d697c7cfd568956bc /drivers/net/wireless/orinoco/cfg.c | |
| parent | zd1201: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} (diff) | |
| download | linux-dev-13c1ac5703d5507da9422377819d5d1e4e550173.tar.xz linux-dev-13c1ac5703d5507da9422377819d5d1e4e550173.zip | |
orinoco: 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}.
Signed-off-by: Zhao, Gang <gamerh2o@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco/cfg.c')
| -rw-r--r-- | drivers/net/wireless/orinoco/cfg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/orinoco/cfg.c b/drivers/net/wireless/orinoco/cfg.c index d01edd2c50c5..a9e94b6db5b7 100644 --- a/drivers/net/wireless/orinoco/cfg.c +++ b/drivers/net/wireless/orinoco/cfg.c @@ -59,7 +59,8 @@ int orinoco_wiphy_register(struct wiphy *wiphy) for (i = 0; i < NUM_CHANNELS; i++) { if (priv->channel_mask & (1 << i)) { priv->channels[i].center_freq = - ieee80211_dsss_chan_to_freq(i + 1); + ieee80211_channel_to_frequency(i + 1, + IEEE80211_BAND_2GHZ); channels++; } } @@ -177,7 +178,7 @@ static int orinoco_set_monitor_channel(struct wiphy *wiphy, if (chandef->chan->band != IEEE80211_BAND_2GHZ) return -EINVAL; - channel = ieee80211_freq_to_dsss_chan(chandef->chan->center_freq); + channel = ieee80211_frequency_to_channel(chandef->chan->center_freq); if ((channel < 1) || (channel > NUM_CHANNELS) || !(priv->channel_mask & (1 << (channel - 1)))) |