Return-path: Received: from mail-pa0-f54.google.com ([209.85.220.54]:59740 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751830AbaBSA7R (ORCPT ); Tue, 18 Feb 2014 19:59:17 -0500 Received: by mail-pa0-f54.google.com with SMTP id fa1so17494407pad.13 for ; Tue, 18 Feb 2014 16:59:16 -0800 (PST) From: "Zhao\, Gang" To: "John W. Linville" Cc: , Johannes Berg Subject: Re: [PATCH 7/7] ieee80211: remove function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} References: Date: Wed, 19 Feb 2014 08:59:05 +0800 In-Reply-To: (Gang Zhao's message of "Tue, 18 Feb 2014 21:36:03 +0800") Message-ID: <878ut75352.fsf@will.lan> (sfid-20140219_015958_025011_F696602C) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-wireless-owner@vger.kernel.org List-ID: 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 > Signed-off-by: Zhao, Gang > --- 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 > */