diff mbox series

[net-next,v1,1/1] wireless: Add KHZ_PER_GHZ to units.h and reuse

Message ID 20240215154136.630029-1-andriy.shevchenko@linux.intel.com
State New
Headers
Series [net-next,v1,1/1] wireless: Add KHZ_PER_GHZ to units.h and reuse |

Commit Message

Andy Shevchenko Feb. 15, 2024, 3:41 p.m. UTC 
  The KHZ_PER_GHZ might be used by others (with the name aligned
with similar constants). Define it in units.h and convert
wireless to use it.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 include/linux/units.h | 5 ++++-
 net/wireless/reg.c    | 7 +++----
 2 files changed, 7 insertions(+), 5 deletions(-)

Comments

Kalle Valo Feb. 15, 2024, 5:23 p.m. UTC | #1 
Andy Shevchenko <andriy.shevchenko@linux.intel.com> writes:

> The KHZ_PER_GHZ might be used by others (with the name aligned
> with similar constants). Define it in units.h and convert
> wireless to use it.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  include/linux/units.h | 5 ++++-
>  net/wireless/reg.c    | 7 +++----
>  2 files changed, 7 insertions(+), 5 deletions(-)

wireless patches go to wireless-next, not net-next. But no need resend
because of this.
Simon Horman Feb. 19, 2024, 10:52 a.m. UTC | #2 
On Thu, Feb 15, 2024 at 05:41:36PM +0200, Andy Shevchenko wrote:
> The KHZ_PER_GHZ might be used by others (with the name aligned
> with similar constants). Define it in units.h and convert
> wireless to use it.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Reviewed-by: Simon Horman <horms@kernel.org>
Andy Shevchenko Feb. 20, 2024, 2:25 p.m. UTC | #3 
On Thu, Feb 15, 2024 at 07:23:06PM +0200, Kalle Valo wrote:
> Andy Shevchenko <andriy.shevchenko@linux.intel.com> writes:
> 
> > The KHZ_PER_GHZ might be used by others (with the name aligned
> > with similar constants). Define it in units.h and convert
> > wireless to use it.

> wireless patches go to wireless-next, not net-next. But no need resend
> because of this.

Aha, thanks. Note, I still don't see it in wireless-next tree. Is everything
on track?
Kalle Valo Feb. 20, 2024, 4:57 p.m. UTC | #4 
Andy Shevchenko <andriy.shevchenko@linux.intel.com> writes:

> On Thu, Feb 15, 2024 at 07:23:06PM +0200, Kalle Valo wrote:
>> Andy Shevchenko <andriy.shevchenko@linux.intel.com> writes:
>> 
>> > The KHZ_PER_GHZ might be used by others (with the name aligned
>> > with similar constants). Define it in units.h and convert
>> > wireless to use it.
>
>> wireless patches go to wireless-next, not net-next. But no need resend
>> because of this.
>
> Aha, thanks. Note, I still don't see it in wireless-next tree. Is everything
> on track?

Yes, it's queued in patchwork:

https://patchwork.kernel.org/project/linux-wireless/patch/20240215154136.630029-1-andriy.shevchenko@linux.intel.com/
diff mbox series

Patch

diff --git a/include/linux/units.h b/include/linux/units.h
index 45110daaf8d3..00e15de33eca 100644
--- a/include/linux/units.h
+++ b/include/linux/units.h
@@ -24,10 +24,13 @@ 
 #define NANOHZ_PER_HZ		1000000000UL
 #define MICROHZ_PER_HZ		1000000UL
 #define MILLIHZ_PER_HZ		1000UL
+
 #define HZ_PER_KHZ		1000UL
-#define KHZ_PER_MHZ		1000UL
 #define HZ_PER_MHZ		1000000UL
 
+#define KHZ_PER_MHZ		1000UL
+#define KHZ_PER_GHZ		1000000UL
+
 #define MILLIWATT_PER_WATT	1000UL
 #define MICROWATT_PER_MILLIWATT	1000UL
 #define MICROWATT_PER_WATT	1000000UL
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 50cadbad485f..753f8e9aa4b1 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -57,6 +57,8 @@ 
 #include <linux/verification.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
+#include <linux/units.h>
+
 #include <net/cfg80211.h>
 #include "core.h"
 #include "reg.h"
@@ -1289,20 +1291,17 @@  static bool is_valid_rd(const struct ieee80211_regdomain *rd)
 static bool freq_in_rule_band(const struct ieee80211_freq_range *freq_range,
 			      u32 freq_khz)
 {
-#define ONE_GHZ_IN_KHZ	1000000
 	/*
 	 * From 802.11ad: directional multi-gigabit (DMG):
 	 * Pertaining to operation in a frequency band containing a channel
 	 * with the Channel starting frequency above 45 GHz.
 	 */
-	u32 limit = freq_khz > 45 * ONE_GHZ_IN_KHZ ?
-			20 * ONE_GHZ_IN_KHZ : 2 * ONE_GHZ_IN_KHZ;
+	u32 limit = freq_khz > 45 * KHZ_PER_GHZ ? 20 * KHZ_PER_GHZ : 2 * KHZ_PER_GHZ;
 	if (abs(freq_khz - freq_range->start_freq_khz) <= limit)
 		return true;
 	if (abs(freq_khz - freq_range->end_freq_khz) <= limit)
 		return true;
 	return false;
-#undef ONE_GHZ_IN_KHZ
 }
 
 /*