| Message ID | c9305f68668f20186c1b2a8f8f3f6dac3d23b5db.1392728354.git.gamerh2o@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Tue, 2014-02-18 at 21:36:03 +0800, Zhao, Gang wrote: > 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> > --- Since staging driver wlan-ng uses function ieee80211_dsss_chan_to_freq, This patch "ieee80211: remove function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}" should be applied later, when that staging-next patch "staging: wlan-ng: replace function ieee80211_dsss_chan_to_freq()" appear on wireless-next. > include/linux/ieee80211.h | 36 ------------------------------------ 1 > file changed, 36 deletions(-) > > diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h > index 5f34935..0629904 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, > } > > /** > - * ieee80211_dsss_chan_to_freq - get channel center frequency > - * @channel: the DSSS channel > - * > - * Convert IEEE802.11 DSSS channel to the center frequency (MHz). > - * Ref IEEE 802.11-2007 section 15.6 > - */ > -static inline int ieee80211_dsss_chan_to_freq(int channel) > -{ > - if ((channel > 0) && (channel < 14)) > - return 2407 + (channel * 5); > - else if (channel == 14) > - return 2484; > - else > - return -1; > -} > - > -/** > - * ieee80211_freq_to_dsss_chan - get channel > - * @freq: the frequency > - * > - * Convert frequency (MHz) to IEEE802.11 DSSS channel > - * Ref IEEE 802.11-2007 section 15.6 > - * > - * This routine selects the channel with the closest center frequency. > - */ > -static inline int ieee80211_freq_to_dsss_chan(int freq) > -{ > - if ((freq >= 2410) && (freq < 2475)) > - return (freq - 2405) / 5; > - else if ((freq >= 2482) && (freq < 2487)) > - return 14; > - else > - return -1; > -} > - > -/** > * ieee80211_tu_to_usec - convert time units (TU) to microseconds > * @tu: the TUs > */ -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Feb 19, 2014 at 08:59:05AM +0800, Zhao, Gang wrote: > On Tue, 2014-02-18 at 21:36:03 +0800, Zhao, Gang wrote: > > 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> > > --- > > Since staging driver wlan-ng uses function ieee80211_dsss_chan_to_freq, > This patch "ieee80211: remove function ieee80211_{dsss_chan_to_freq, > freq_to_dsss_chan}" should be applied later, when that staging-next > patch "staging: wlan-ng: replace function ieee80211_dsss_chan_to_freq()" > appear on wireless-next. I'm not particularly concerned about breaking drivers in staging... John
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 5f34935..0629904 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, } /** - * ieee80211_dsss_chan_to_freq - get channel center frequency - * @channel: the DSSS channel - * - * Convert IEEE802.11 DSSS channel to the center frequency (MHz). - * Ref IEEE 802.11-2007 section 15.6 - */ -static inline int ieee80211_dsss_chan_to_freq(int channel) -{ - if ((channel > 0) && (channel < 14)) - return 2407 + (channel * 5); - else if (channel == 14) - return 2484; - else - return -1; -} - -/** - * ieee80211_freq_to_dsss_chan - get channel - * @freq: the frequency - * - * Convert frequency (MHz) to IEEE802.11 DSSS channel - * Ref IEEE 802.11-2007 section 15.6 - * - * This routine selects the channel with the closest center frequency. - */ -static inline int ieee80211_freq_to_dsss_chan(int freq) -{ - if ((freq >= 2410) && (freq < 2475)) - return (freq - 2405) / 5; - else if ((freq >= 2482) && (freq < 2487)) - return 14; - else - return -1; -} - -/** * ieee80211_tu_to_usec - convert time units (TU) to microseconds * @tu: the TUs */
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> --- include/linux/ieee80211.h | 36 ------------------------------------ 1 file changed, 36 deletions(-)