diff options
author | Zhao, Gang <gamerh2o@gmail.com> | 2014-02-18 08:36:03 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-02-28 14:12:36 -0500 |
commit | 3ebe8e257307a87c33460aa7d2b75dadd374ed9c (patch) | |
tree | 7fd2f008df4d61347ba429f1325439c1d51fd476 | |
parent | 13c1ac5703d5507da9422377819d5d1e4e550173 (diff) |
ieee80211: remove function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}
Function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} have been
replaced with ieee80211_{channel_to_frequency, frequency_to_channel}.
There should be no users of the two functions now. So remove them.
Cc: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Zhao, Gang <gamerh2o@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | include/linux/ieee80211.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 5f349355ee54..06299048c4f4 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
@@ -2308,42 +2308,6 @@ static inline bool ieee80211_is_public_action(struct ieee80211_hdr *hdr, | |||
2308 | } | 2308 | } |
2309 | 2309 | ||
2310 | /** | 2310 | /** |
2311 | * ieee80211_dsss_chan_to_freq - get channel center frequency | ||
2312 | * @channel: the DSSS channel | ||
2313 | * | ||
2314 | * Convert IEEE802.11 DSSS channel to the center frequency (MHz). | ||
2315 | * Ref IEEE 802.11-2007 section 15.6 | ||
2316 | */ | ||
2317 | static inline int ieee80211_dsss_chan_to_freq(int channel) | ||
2318 | { | ||
2319 | if ((channel > 0) && (channel < 14)) | ||
2320 | return 2407 + (channel * 5); | ||
2321 | else if (channel == 14) | ||
2322 | return 2484; | ||
2323 | else | ||
2324 | return -1; | ||
2325 | } | ||
2326 | |||
2327 | /** | ||
2328 | * ieee80211_freq_to_dsss_chan - get channel | ||
2329 | * @freq: the frequency | ||
2330 | * | ||
2331 | * Convert frequency (MHz) to IEEE802.11 DSSS channel | ||
2332 | * Ref IEEE 802.11-2007 section 15.6 | ||
2333 | * | ||
2334 | * This routine selects the channel with the closest center frequency. | ||
2335 | */ | ||
2336 | static inline int ieee80211_freq_to_dsss_chan(int freq) | ||
2337 | { | ||
2338 | if ((freq >= 2410) && (freq < 2475)) | ||
2339 | return (freq - 2405) / 5; | ||
2340 | else if ((freq >= 2482) && (freq < 2487)) | ||
2341 | return 14; | ||
2342 | else | ||
2343 | return -1; | ||
2344 | } | ||
2345 | |||
2346 | /** | ||
2347 | * ieee80211_tu_to_usec - convert time units (TU) to microseconds | 2311 | * ieee80211_tu_to_usec - convert time units (TU) to microseconds |
2348 | * @tu: the TUs | 2312 | * @tu: the TUs |
2349 | */ | 2313 | */ |