api clean: ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}
Subsystems (3)
cover api clean: ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}
This patch set's purpose is to remove function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}, by replacing them with more generic function ieee80211_{channel_to_frequency, frequency_to_channel}.
The error number they return is different. the 'dsss' one return -1, the other return zero. Fortunately most of the code have correct error check to handle both situation. Good luck to those code which never check the return value.
By the way, this patch set only compile tested.
Zhao, Gang (7):
airo: replace function ieee80211_{dsss_chan_to_freq,
freq_to_dsss_chan}
atmel: replace function ieee80211_{dsss_chan_to_freq,
freq_to_dsss_chan}
wl3501_cs: replace function ieee80211_{dsss_chan_to_freq,
freq_to_dsss_chan}
rndis_wlan: replace function ieee80211_{dsss_chan_to_freq,
freq_to_dsss_chan}
zd1201: replace function ieee80211_{dsss_chan_to_freq,
freq_to_dsss_chan}
orinoco: replace function ieee80211_{dsss_chan_to_freq,
freq_to_dsss_chan}
ieee80211: remove function ieee80211_{dsss_chan_to_freq,
freq_to_dsss_chan}drivers/net/wireless/airo.c | 13 ++++++++----- drivers/net/wireless/atmel.c | 8 ++++---- drivers/net/wireless/orinoco/cfg.c | 4 ++-- drivers/net/wireless/orinoco/hw.c | 2 +- drivers/net/wireless/orinoco/scan.c | 5 +++-- drivers/net/wireless/orinoco/wext.c | 2 +- drivers/net/wireless/rndis_wlan.c | 3 ++- drivers/net/wireless/wl3501_cs.c | 5 +++-- drivers/net/wireless/zd1201.c | 9 +++------ include/linux/ieee80211.h | 36 ------------------------------------ 10 files changed, 27 insertions(+), 60 deletions(-)
Signature · 1 line
1.8.5.3
PATCH 1/7 airo: 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}.
Include <net/cfg80211.h> for the defination of IEEE80211_BAND_2GHZ. Because <net/cfg80211.h> includes <linux/ieee80211.h>, so we can replace <linux/ieee80211.h> with <net/cfg80211.h>.
This change is a preparation for the removal of function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}.
--- drivers/net/wireless/airo.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/net/wireless/airo.c +8 -5
@@ -49,7 +49,7 @@#include <linux/kthread.h> #include <linux/freezer.h> -#include <linux/ieee80211.h> +#include <net/cfg80211.h> #include <net/iw_handler.h> #include "airo.h"
@@ -5797,7 +5797,7 @@ static int airo_set_freq(struct net_device *dev,/* Hack to fall through... */ fwrq->e =0 ; - fwrq->m =ieee80211_freq_to_dsss_chan (f); + fwrq->m =ieee80211_frequency_to_channel (f); }/* Setting by channel number */ if ((fwrq->m >1000 ) || (fwrq->e >0 ))
@@ -5841,7 +5841,8 @@ static int airo_get_freq(struct net_device *dev, ch =le16_to_cpu (status_rid.channel);if ((ch >0 ) && (ch <15 )) { - fwrq->m =ieee80211_dsss_chan_to_freq (ch) *100000 ; + fwrq->m =100000 * +ieee80211_channel_to_frequency (ch,IEEE80211_BAND_2GHZ ); fwrq->e =1 ; }else { fwrq->m = ch;
@@ -6898,7 +6899,8 @@ static int airo_get_range(struct net_device *dev, k =0 ;for (i =0 ; i <14 ; i++) { range->freq[k].i = i +1 ;/* List index */ - range->freq[k].m =ieee80211_dsss_chan_to_freq (i +1 ) *100000 ; + range->freq[k].m =100000 * +ieee80211_channel_to_frequency (i +1 ,IEEE80211_BAND_2GHZ ); range->freq[k++].e =1 ;/* Values in MHz -> * 10^5 * 10 */ } range->num_frequency = k;
@@ -7297,7 +7299,8 @@ static inline char *airo_translate_scan(struct net_device *dev,/* Add frequency */ iwe.cmd =SIOCGIWFREQ ; iwe.u.freq.m =le16_to_cpu (bss->dsChannel); - iwe.u.freq.m =ieee80211_dsss_chan_to_freq (iwe.u.freq.m) *100000 ; + iwe.u.freq.m =100000 * +ieee80211_channel_to_frequency (iwe.u.freq.m,IEEE80211_BAND_2GHZ ); iwe.u.freq.e =1 ; current_ev =iwe_stream_add_event (info, current_ev, end_buf, &iwe,IW_EV_FREQ_LEN );
Signature · 1 line
1.8.5.3
PATCH 2/7 atmel: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}
In reply to Zhao, GangReplace ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} with more generic ieee80211_{channel_to_frequency, frequency_to_channel}.
Include <net/cfg80211.h> for the defination of IEEE80211_BAND_2GHZ. Because <net/cfg80211.h> includes <linux/ieee80211.h>, so we can replace <linux/ieee80211.h> with <net/cfg80211.h>.
This change is a preparation for the removal of function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}.
--- drivers/net/wireless/atmel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/atmel.c +4 -4
@@ -67,7 +67,7 @@#include <linux/moduleparam.h> #include <linux/firmware.h> #include <linux/jiffies.h> -#include <linux/ieee80211.h> +#include <net/cfg80211.h> #include "atmel.h" #define DRIVER_MAJOR 0
@@ -2273,7 +2273,7 @@ static int atmel_set_freq(struct net_device *dev,/* Hack to fall through... */ fwrq->e =0 ; - fwrq->m =ieee80211_freq_to_dsss_chan (f); + fwrq->m =ieee80211_frequency_to_channel (f); }/* Setting by channel number */ if ((fwrq->m >1000 ) || (fwrq->e >0 ))
@@ -2434,8 +2434,8 @@ static int atmel_get_range(struct net_device *dev, range->freq[k].i = i;/* List index */ /* Values in MHz -> * 10^5 * 10 */ - range->freq[k].m = (ieee80211_dsss_chan_to_freq (i) * -100000 ); + range->freq[k].m =100000 * +ieee80211_channel_to_frequency (i,IEEE80211_BAND_2GHZ ); range->freq[k++].e =1 ; } range->num_frequency = k;
Signature · 1 line
1.8.5.3
PATCH 3/7 wl3501_cs: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}
In reply to Zhao, GangReplace ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} with more generic ieee80211_{channel_to_frequency, frequency_to_channel}.
Include <net/cfg80211.h> for the defination of IEEE80211_BAND_2GHZ. Because <net/cfg80211.h> includes <linux/ieee80211.h>, so we can replace <linux/ieee80211.h> with <net/cfg80211.h>.
This change is a preparation for the removal of function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}.
--- drivers/net/wireless/wl3501_cs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/wl3501_cs.c +3 -2
@@ -42,7 +42,7 @@#include <linux/slab.h> #include <linux/string.h> #include <linux/wireless.h> -#include <linux/ieee80211.h> +#include <net/cfg80211.h> #include <linux/etherdevice.h> #include <net/iw_handler.h>
@@ -1454,7 +1454,8 @@ static int wl3501_get_freq(struct net_device *dev, struct iw_request_info *info, {struct wl3501_card *this =netdev_priv (dev); - wrqu->freq.m =ieee80211_dsss_chan_to_freq (this->chan) *100000 ; + wrqu->freq.m =100000 * +ieee80211_channel_to_frequency (this->chan,IEEE80211_BAND_2GHZ ); wrqu->freq.e =1 ;return 0 ; }
Signature · 1 line
1.8.5.3
PATCH 4/7 rndis_wlan: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}
In reply to Zhao, GangReplace 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}.
--- drivers/net/wireless/rndis_wlan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/rndis_wlan.c +2 -1
@@ -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,
Signature · 1 line
1.8.5.3
PATCH 5/7 zd1201: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}
In reply to Zhao, GangReplace ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} with more generic ieee80211_{channel_to_frequency, frequency_to_channel}.
Function ieee80211_frequency_to_channel() will return 0 if frequency is not correctly provided, so no need to set channel to 0 explicitly.
Include <net/cfg80211.h> for the defination of IEEE80211_BAND_2GHZ. Because <net/cfg80211.h> includes <linux/ieee80211.h>, so we can replace <linux/ieee80211.h> with <net/cfg80211.h>.
This change is a preparation for the removal of function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}.
--- drivers/net/wireless/zd1201.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/net/wireless/zd1201.c +3 -6
@@ -18,7 +18,7 @@#include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/wireless.h> -#include <linux/ieee80211.h> +#include <net/cfg80211.h> #include <net/iw_handler.h> #include <linux/string.h> #include <linux/if_arp.h>
@@ -914,11 +914,8 @@ static int zd1201_set_freq(struct net_device *dev,if (freq->e ==0 ) channel = freq->m; -else { - channel =ieee80211_freq_to_dsss_chan (freq->m); -if (channel <0 ) - channel =0 ; - } +else + channel =ieee80211_frequency_to_channel (freq->m); err =zd1201_setconfig16 (zd,ZD1201_RID_CNFOWNCHANNEL , channel);if (err)
Signature · 1 line
1.8.5.3
PATCH 6/7 orinoco: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}
In reply to Zhao, GangReplace 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}.
--- drivers/net/wireless/orinoco/cfg.c | 4 ++-- drivers/net/wireless/orinoco/hw.c | 2 +- drivers/net/wireless/orinoco/scan.c | 5 +++-- drivers/net/wireless/orinoco/wext.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-)
drivers/net/wireless/orinoco/cfg.c +2 -2
@@ -59,7 +59,7 @@ 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 +177,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 ))))
drivers/net/wireless/orinoco/hw.c +1 -1
@@ -1193,7 +1193,7 @@ int orinoco_hw_get_freq(struct orinoco_private *priv) goto out; } - freq =ieee80211_dsss_chan_to_freq (channel); + freq =ieee80211_channel_to_frequency (channel,IEEE80211_BAND_2GHZ ); out:orinoco_unlock (priv, &flags);
drivers/net/wireless/orinoco/scan.c +3 -2
@@ -110,7 +110,8 @@ static void orinoco_add_hostscan_result(struct orinoco_private *priv,break ; } - freq =ieee80211_dsss_chan_to_freq (le16_to_cpu (bss->a.channel)); + freq =ieee80211_channel_to_frequency ( +le16_to_cpu (bss->a.channel),IEEE80211_BAND_2GHZ ); channel =ieee80211_get_channel (wiphy, freq);if (!channel) { printk(KERN_DEBUG "Invalid channel designation %04X(%04X)",
@@ -146,7 +147,7 @@ void orinoco_add_extscan_result(struct orinoco_private *priv, ie_len = len -sizeof (*bss); ie =cfg80211_find_ie (WLAN_EID_DS_PARAMS , bss->data, ie_len); chan = ie ? ie[2 ] :0 ; - freq =ieee80211_dsss_chan_to_freq (chan); + freq =ieee80211_channel_to_frequency (chan,IEEE80211_BAND_2GHZ ); channel =ieee80211_get_channel (wiphy, freq); timestamp =le64_to_cpu (bss->timestamp);
drivers/net/wireless/orinoco/wext.c +1 -1
@@ -444,7 +444,7 @@ static int orinoco_ioctl_setfreq(struct net_device *dev,for (i =0 ; i < (6 - frq->e); i++) denom *=10 ; - chan =ieee80211_freq_to_dsss_chan (frq->m / denom); + chan =ieee80211_frequency_to_channel (frq->m / denom); } if ((chan < 1) || (chan > NUM_CHANNELS) ||
Signature · 1 line
1.8.5.3
PATCH 7/7 ieee80211: remove function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}
In reply to Zhao, GangFunction 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.
--- include/linux/ieee80211.h | 36 ------------------------------------ 1 file changed, 36 deletions(-)
include/linux/ieee80211.h +0 -36
@@ -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 */
Signature · 1 line
1.8.5.3
Re: [PATCH 7/7] ieee80211: remove function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}
Quoted 8 lines · Gang
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 <[email protected]>Signed-off-by Zhao, Gang <[email protected]>---
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.
Quoted 50 lines
include/linux/ieee80211.h| 36 ------------------------------------ 1 file changed, 36 deletions(-)include/linux/ieee80211.h +0
-36@@ -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 */
Re: [PATCH 6/7] orinoco: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}
In reply to Zhao, GangQuoted 22 lines · Gang
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 useIEEE80211_BAND_2GHZhere.This change is a preparation for the removal of function ieee80211_{dsss_chan_to_freq,
freq_to_dsss_chan}.Signed-off-by Zhao, Gang <[email protected]>--- drivers/net/wireless/orinoco/cfg.c | 4 ++-- drivers/net/wireless/orinoco/hw.c | 2 +- drivers/net/wireless/orinoco/scan.c | 5 +++-- drivers/net/wireless/orinoco/wext.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-)drivers/net/wireless/orinoco/cfg.c +0
-0
drivers/net/wireless/orinoco/cfg.c int orinoco_wiphy_register(struct wiphy *wiphy) · line 64
Quoted 7 lines
drivers/net/wireless/orinoco/cfg.c +1
-1@@ -59,7 +59,7 @@ 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++; }
Can you tweak that indentation so that it doesn't unindent here. If it has to be on one line I'd prefer to exceed 80 chars than back indent.
Thanks,
Dave.
PATCH v2 6/7 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}.
---
v2: indention change suggested by Dave Kilroy
drivers/net/wireless/orinoco/cfg.c | 5 +++-- drivers/net/wireless/orinoco/hw.c | 2 +- drivers/net/wireless/orinoco/scan.c | 5 +++-- drivers/net/wireless/orinoco/wext.c | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-)
drivers/net/wireless/orinoco/cfg.c +3 -2
@@ -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 ))))
drivers/net/wireless/orinoco/hw.c +1 -1
@@ -1193,7 +1193,7 @@ int orinoco_hw_get_freq(struct orinoco_private *priv) goto out; } - freq =ieee80211_dsss_chan_to_freq (channel); + freq =ieee80211_channel_to_frequency (channel,IEEE80211_BAND_2GHZ ); out:orinoco_unlock (priv, &flags);
drivers/net/wireless/orinoco/scan.c +3 -2
@@ -110,7 +110,8 @@ static void orinoco_add_hostscan_result(struct orinoco_private *priv,break ; } - freq =ieee80211_dsss_chan_to_freq (le16_to_cpu (bss->a.channel)); + freq =ieee80211_channel_to_frequency ( +le16_to_cpu (bss->a.channel),IEEE80211_BAND_2GHZ ); channel =ieee80211_get_channel (wiphy, freq);if (!channel) { printk(KERN_DEBUG "Invalid channel designation %04X(%04X)",
@@ -146,7 +147,7 @@ void orinoco_add_extscan_result(struct orinoco_private *priv, ie_len = len -sizeof (*bss); ie =cfg80211_find_ie (WLAN_EID_DS_PARAMS , bss->data, ie_len); chan = ie ? ie[2 ] :0 ; - freq =ieee80211_dsss_chan_to_freq (chan); + freq =ieee80211_channel_to_frequency (chan,IEEE80211_BAND_2GHZ ); channel =ieee80211_get_channel (wiphy, freq); timestamp =le64_to_cpu (bss->timestamp);
drivers/net/wireless/orinoco/wext.c +1 -1
@@ -444,7 +444,7 @@ static int orinoco_ioctl_setfreq(struct net_device *dev,for (i =0 ; i < (6 - frq->e); i++) denom *=10 ; - chan =ieee80211_freq_to_dsss_chan (frq->m / denom); + chan =ieee80211_frequency_to_channel (frq->m / denom); } if ((chan < 1) || (chan > NUM_CHANNELS) ||
Signature · 1 line
1.8.5.3
Johannes Berg
maintainerQuoted 4 lines · Gang
This patch set's purpose is to remove function ieee80211_{dsss_chan_to_freq,
freq_to_dsss_chan}, by replacing them with more generic function ieee80211_{channel_to_frequency,frequency_to_channel}.
I'm fine with this, but I won't take the patches. John, please take patch 7 as well as the rest if/when you decide to do so.
johannes
Re: [PATCH 7/7] ieee80211: remove function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}
In reply to Zhao, GangQuoted 10 lines · Gang
Quoted 8 lines · Gang
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 <[email protected]>Signed-off-by Zhao, Gang <[email protected]>---
Quoted 5 lines
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 functionieee80211_dsss_chan_to_freq()" appear on wireless-next.
I'm not particularly concerned about breaking drivers in staging...
John
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.