[PATCH] cfg80211: Convert 6 GHz channel frequency to channel number

[PATCH] cfg80211: Convert 6 GHz channel frequency to channel number

[Amar Singhal]

Enhance function ieee80211_frequency_to_channel by adding 6 GHz
channels.

Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
---
 net/wireless/util.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/wireless/util.c b/net/wireless/util.c
index cf63b63..9aba8d54 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -111,8 +111,10 @@ int ieee80211_frequency_to_channel(int freq)
 		return (freq - 2407) / 5;
 	else if (freq >= 4910 && freq <= 4980)
 		return (freq - 4000) / 5;
-	else if (freq <= 45000) /* DMG band lower limit */
+	else if (freq > 5000 && freq <= 5920)
 		return (freq - 5000) / 5;
+	else if (freq >= 5945 && freq <= 7205)
+		  return (freq - 5940) / 5;
 	else if (freq >= 58320 && freq <= 70200)
 		return (freq - 56160) / 2160;
 	else
--
1.9.1

Re: [PATCH] cfg80211: Convert 6 GHz channel frequency to channel number

[Johannes Berg]

On Thu, 2019-08-29 at 15:21 -0700, Amar Singhal wrote:
> Enhance function ieee80211_frequency_to_channel by adding 6 GHz
> channels.

Wait, this is already supported, no? Just implemented slightly
differently?

johannes

Re: [PATCH] cfg80211: Convert 6 GHz channel frequency to channel number

[Arend Van Spriel]

On 8/30/2019 12:21 AM, Amar Singhal wrote:
> Enhance function ieee80211_frequency_to_channel by adding 6 GHz
> channels.

This look very similar to what I submitted earlier:

https://patchwork.kernel.org/patch/11073197/

Regards,
Arend

Re: [PATCH] cfg80211: Convert 6 GHz channel frequency to channel number

[Arend Van Spriel]

On 8/30/2019 12:32 PM, Johannes Berg wrote:
> On Thu, 2019-08-29 at 15:21 -0700, Amar Singhal wrote:
>> Enhance function ieee80211_frequency_to_channel by adding 6 GHz
>> channels.
> 
> Wait, this is already supported, no? Just implemented slightly
> differently?

It is Johannes, but I was unaware as well. Did you forget to email that 
it was applied or is there some automated stuff that failed on you? ;-)

Regards,
Arend

Re: [PATCH] cfg80211: Convert 6 GHz channel frequency to channel number

[Johannes Berg]

On Fri, 2019-08-30 at 12:47 +0200, Arend Van Spriel wrote:
> On 8/30/2019 12:32 PM, Johannes Berg wrote:
> > On Thu, 2019-08-29 at 15:21 -0700, Amar Singhal wrote:
> > > Enhance function ieee80211_frequency_to_channel by adding 6 GHz
> > > channels.
> > 
> > Wait, this is already supported, no? Just implemented slightly
> > differently?
> 
> It is Johannes, but I was unaware as well. Did you forget to email that 
> it was applied or is there some automated stuff that failed on you? ;-)

Truth be told, I've been very lazy (mostly due to being busy) and
haven't responded manually - and also haven't managed to set up anything
that would automate a response, I tried Kalle's tool at one point but it
didn't work for me yet.

Right now, your best bet is probably to poll patchwork, sorry about
that.

johannes

Re: [PATCH] cfg80211: Convert 6 GHz channel frequency to channel number

[asinghal]

On 2019-08-30 03:45, Arend Van Spriel wrote:
> On 8/30/2019 12:21 AM, Amar Singhal wrote:
>> Enhance function ieee80211_frequency_to_channel by adding 6 GHz
>> channels.
> 
> This look very similar to what I submitted earlier:
> 
> https://patchwork.kernel.org/patch/11073197/
> 
> Regards,
> Arend
-	else if (freq <= 45000) /* DMG band lower limit */
+	else if (freq < 5940)
  		return (freq - 5000) / 5;
+	else if (freq <= 45000) /* DMG band lower limit */
+		/* see 802.11ax D4.1 27.3.22.2 */
+		return (freq - 5940) / 5;

hi Arend,
           I see a small issue in your patch above; for frequency 5940, 
the channel number returned would be 0 which is an invalid channel. I 
guess 6 GHz center frequency numbers begin with 4945.

rgds,
Amar

Re: [PATCH] cfg80211: Convert 6 GHz channel frequency to channel number

[asinghal]

Correction in typo below:

On 2019-08-30 11:03, asinghal@codeaurora.org wrote:
> On 2019-08-30 03:45, Arend Van Spriel wrote:
>> On 8/30/2019 12:21 AM, Amar Singhal wrote:
>>> Enhance function ieee80211_frequency_to_channel by adding 6 GHz
>>> channels.
>> 
>> This look very similar to what I submitted earlier:
>> 
>> https://patchwork.kernel.org/patch/11073197/
>> 
>> Regards,
>> Arend
> -	else if (freq <= 45000) /* DMG band lower limit */
> +	else if (freq < 5940)
>  		return (freq - 5000) / 5;
> +	else if (freq <= 45000) /* DMG band lower limit */
> +		/* see 802.11ax D4.1 27.3.22.2 */
> +		return (freq - 5940) / 5;
> 
> hi Arend,
>           I see a small issue in your patch above; for frequency 5940,
> the channel number returned would be 0 which is an invalid channel. I
> guess 6 GHz center frequency numbers begin with 5945.
> 
> rgds,
> Amar