| Message ID | 8b96c31da0f8a23b8e99ed790e462bd933925041.1389947627.git.gamerh2o@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Fri, Jan 17, 2014 at 5:11 PM, ZHAO Gang <gamerh2o@gmail.com> wrote: > The b43_freq_to_channel_{2,5}ghz() should be changed to > b43_channel_to_freq{2,5}ghz() if we want to use b43 helper function, > but a better way is to use kernel api ieee80211_channel_to_frequency() > and remove these unnecessary helper function. > > Signed-off-by: ZHAO Gang <gamerh2o@gmail.com> > --- > v2: combine two patches to one. > suggested by Luca Coelho and Rafa? Mi?ecki > The version 2 patch should be ignored. After more discussion, it seems it's good to let the fix be two patches. > drivers/net/wireless/b43/main.h | 35 ----------------------------------- > drivers/net/wireless/b43/xmit.c | 12 ++++++------ > 2 files changed, 6 insertions(+), 41 deletions(-) > > diff --git a/drivers/net/wireless/b43/main.h b/drivers/net/wireless/b43/main.h > index abac25e..f476fc3 100644 > --- a/drivers/net/wireless/b43/main.h > +++ b/drivers/net/wireless/b43/main.h > @@ -58,41 +58,6 @@ enum b43_verbosity { > #endif > }; > > - > -/* Lightweight function to convert a frequency (in Mhz) to a channel number. */ > -static inline u8 b43_freq_to_channel_5ghz(int freq) > -{ > - return ((freq - 5000) / 5); > -} > -static inline u8 b43_freq_to_channel_2ghz(int freq) > -{ > - u8 channel; > - > - if (freq == 2484) > - channel = 14; > - else > - channel = (freq - 2407) / 5; > - > - return channel; > -} > - > -/* Lightweight function to convert a channel number to a frequency (in Mhz). */ > -static inline int b43_channel_to_freq_5ghz(u8 channel) > -{ > - return (5000 + (5 * channel)); > -} > -static inline int b43_channel_to_freq_2ghz(u8 channel) > -{ > - int freq; > - > - if (channel == 14) > - freq = 2484; > - else > - freq = 2407 + (5 * channel); > - > - return freq; > -} > - > static inline int b43_is_cck_rate(int rate) > { > return (rate == B43_CCK_RATE_1MB || > diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c > index 4ae63f4..218a0f3 100644 > --- a/drivers/net/wireless/b43/xmit.c > +++ b/drivers/net/wireless/b43/xmit.c > @@ -806,7 +806,8 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) > B43_WARN_ON(1); > /* FIXME: We don't really know which value the "chanid" contains. > * So the following assignment might be wrong. */ > - status.freq = b43_channel_to_freq_5ghz(chanid); > + status.freq = > + ieee80211_channel_to_frequency(chanid, status.band); > break; > case B43_PHYTYPE_G: > status.band = IEEE80211_BAND_2GHZ; > @@ -819,13 +820,12 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) > case B43_PHYTYPE_HT: > /* chanid is the SHM channel cookie. Which is the plain > * channel number in b43. */ > - if (chanstat & B43_RX_CHAN_5GHZ) { > + if (chanstat & B43_RX_CHAN_5GHZ) > status.band = IEEE80211_BAND_5GHZ; > - status.freq = b43_freq_to_channel_5ghz(chanid); > - } else { > + else > status.band = IEEE80211_BAND_2GHZ; > - status.freq = b43_freq_to_channel_2ghz(chanid); > - } > + status.freq = > + ieee80211_channel_to_frequency(chanid, status.band); > break; > default: > B43_WARN_ON(1); > -- > 1.8.4.2 > -- 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
diff --git a/drivers/net/wireless/b43/main.h b/drivers/net/wireless/b43/main.h index abac25e..f476fc3 100644 --- a/drivers/net/wireless/b43/main.h +++ b/drivers/net/wireless/b43/main.h @@ -58,41 +58,6 @@ enum b43_verbosity { #endif }; - -/* Lightweight function to convert a frequency (in Mhz) to a channel number. */ -static inline u8 b43_freq_to_channel_5ghz(int freq) -{ - return ((freq - 5000) / 5); -} -static inline u8 b43_freq_to_channel_2ghz(int freq) -{ - u8 channel; - - if (freq == 2484) - channel = 14; - else - channel = (freq - 2407) / 5; - - return channel; -} - -/* Lightweight function to convert a channel number to a frequency (in Mhz). */ -static inline int b43_channel_to_freq_5ghz(u8 channel) -{ - return (5000 + (5 * channel)); -} -static inline int b43_channel_to_freq_2ghz(u8 channel) -{ - int freq; - - if (channel == 14) - freq = 2484; - else - freq = 2407 + (5 * channel); - - return freq; -} - static inline int b43_is_cck_rate(int rate) { return (rate == B43_CCK_RATE_1MB || diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c index 4ae63f4..218a0f3 100644 --- a/drivers/net/wireless/b43/xmit.c +++ b/drivers/net/wireless/b43/xmit.c @@ -806,7 +806,8 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) B43_WARN_ON(1); /* FIXME: We don't really know which value the "chanid" contains. * So the following assignment might be wrong. */ - status.freq = b43_channel_to_freq_5ghz(chanid); + status.freq = + ieee80211_channel_to_frequency(chanid, status.band); break; case B43_PHYTYPE_G: status.band = IEEE80211_BAND_2GHZ; @@ -819,13 +820,12 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) case B43_PHYTYPE_HT: /* chanid is the SHM channel cookie. Which is the plain * channel number in b43. */ - if (chanstat & B43_RX_CHAN_5GHZ) { + if (chanstat & B43_RX_CHAN_5GHZ) status.band = IEEE80211_BAND_5GHZ; - status.freq = b43_freq_to_channel_5ghz(chanid); - } else { + else status.band = IEEE80211_BAND_2GHZ; - status.freq = b43_freq_to_channel_2ghz(chanid); - } + status.freq = + ieee80211_channel_to_frequency(chanid, status.band); break; default: B43_WARN_ON(1);
The b43_freq_to_channel_{2,5}ghz() should be changed to b43_channel_to_freq{2,5}ghz() if we want to use b43 helper function, but a better way is to use kernel api ieee80211_channel_to_frequency() and remove these unnecessary helper function. Signed-off-by: ZHAO Gang <gamerh2o@gmail.com> --- v2: combine two patches to one. suggested by Luca Coelho and Rafa? Mi?ecki drivers/net/wireless/b43/main.h | 35 ----------------------------------- drivers/net/wireless/b43/xmit.c | 12 ++++++------ 2 files changed, 6 insertions(+), 41 deletions(-)