[PATCH] cfg80211: Extend channel to frequency mapping for 802.11j

[Johannes Berg]

On Tue, 2011-01-11 at 18:17 +0900, Bruno Randolf wrote:

> > compat-wireless-2011-01-07.orig/drivers/net/wireless/libertas/cfg.c	2011-0
> > 1-07 15:03:59.000000000 -0500
> > +++
> > compat-wireless-2011-01-07/drivers/net/wireless/libertas/cfg.c	2011-01-08
> > 07:51:23.947290769 -0500
> > @@ -607,7 +607,8 @@
> >  		/* No channel, no luck */
> >  		if (chan_no != -1) {
> >  			struct wiphy *wiphy = priv->wdev->wiphy;
> > -			int freq = ieee80211_channel_to_frequency(chan_no);
> > +			int freq = ieee80211_channel_to_frequency(chan_no,
> > +					chan_no <= 14 ? IEEE80211_BAND_2GHZ : 
> IEEE80211_BAND_5GHZ);
> 
> The whole point of having the band argument is to avoid this. We now have 
> overlapping channel numbers: channel 8 and 12 are defined in 5GHz as well as 
> in 2.4GHz (that is for 20MHz channel width, there are more for 10 and 5MHz 
> width, but we don't support that yet). The band has to come from the hardware 
> or driver configuration.

I don't think libertas (or orinoco) support the frequencies that
overlap, and they use the channel number in HW config, so it should be
fine.

johannes