On Thu, 2019-08-29 at 14:49 -0700, Amar Singhal wrote: > Add new helper function to convert (chan_number, oper_class) pair to > frequency. Call this function ieee80211_channel_op_class_to_frequency. > This function would be very useful in the context of 6 GHz channels, > where channel number is not unique.
Nit: it is unique within 6 GHz, just not within the overall channel number space, and that was actually already not unique before, it just didn't matter much to us :-) I may reword that when I apply it. > Signed-off-by: Amar Singhal <[email protected]> > --- > include/net/cfg80211.h | 10 ++++++++++ > net/wireless/util.c | 23 +++++++++++++++++++++++ > 2 files changed, 33 insertions(+) > > diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h > index 6467b60..decafba 100644 > --- a/include/net/cfg80211.h > +++ b/include/net/cfg80211.h > @@ -4914,1 +4914,1 @@ static inline void *wdev_priv(struct wireless_dev *wdev) > int ieee80211_channel_to_frequency(int chan, enum nl80211_band band); > > /** > + * ieee80211_channel_op_class_to_frequency - convert > + * (channel, operating class) to frequency That's formatted badly, the short description must fit on one line. > + if (global_op_class >= 131 && global_op_class <= 135) > + return (5940 + 5 * chan_num); > + else if (global_op_class >= 115 && global_op_class <= 130) > + return (5000 + 5 * chan_num); > + else if (global_op_class >= 112 && global_op_class <= 113) > + return (5000 + 5 * chan_num); > + else if (global_op_class >= 109 && global_op_class <= 110) > + return (4000 + 5 * chan_num); > + else if (global_op_class >= 83 && global_op_class <= 84) > + return (2407 + 5 * chan_num); > + else if (global_op_class == 81) > + return (2407 + 5 * chan_num); > + else if (global_op_class == 82) > + return (2414 + 5 * chan_num); > + else if (global_op_class == 180) > + return (56160 + 5 * chan_num); I think it would be good to have a list of valid channel numbers for them as well. I was wondering about 82 for a second there for example, until I looked up again that it is just for channel 14. I think this is also missing 83/84 and various other operating classes for wider channels. Perhaps in those we don't really need to check the channel numbers precisely, i.e. we could probably treat 81/83/84 all the same. But depending on what you feed to the function, it's possible that you could encounter those other operating classes. johannes
