public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-04-13 09:59:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi: cfg80211: Add KHZ_PER_GHZ to units.h and reuse

Browse source 
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>
Link: https://msgid.link/20240215154136.630029-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Andy Shevchenko 2024-02-15 17:41:36 +02:00 • committed by Johannes Berg
parent ba4b1fa312
commit f79ab5d2bc
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/linux/units.h
View file

@ -24,10 +24,13 @@
#define NANOHZ_PER_HZ 1000000000UL #define NANOHZ_PER_HZ 1000000000UL
#define MICROHZ_PER_HZ 1000000UL #define MICROHZ_PER_HZ 1000000UL
#define MILLIHZ_PER_HZ 1000UL #define MILLIHZ_PER_HZ 1000UL
#define HZ_PER_KHZ 1000UL #define HZ_PER_KHZ 1000UL
#define KHZ_PER_MHZ 1000UL
#define HZ_PER_MHZ 1000000UL #define HZ_PER_MHZ 1000000UL
#define KHZ_PER_MHZ 1000UL
#define KHZ_PER_GHZ 1000000UL
#define MILLIWATT_PER_WATT 1000UL #define MILLIWATT_PER_WATT 1000UL
#define MICROWATT_PER_MILLIWATT 1000UL #define MICROWATT_PER_MILLIWATT 1000UL
#define MICROWATT_PER_WATT 1000000UL #define MICROWATT_PER_WATT 1000000UL

7
net/wireless/reg.c
View file

@ -57,6 +57,8 @@
#include <linux/verification.h> #include <linux/verification.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/units.h>
#include <net/cfg80211.h> #include <net/cfg80211.h>
#include "core.h" #include "core.h"
#include "reg.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, static bool freq_in_rule_band(const struct ieee80211_freq_range *freq_range,
u32 freq_khz) u32 freq_khz)
{ {
#define ONE_GHZ_IN_KHZ 1000000
/* /*
* From 802.11ad: directional multi-gigabit (DMG): * From 802.11ad: directional multi-gigabit (DMG):
* Pertaining to operation in a frequency band containing a channel * Pertaining to operation in a frequency band containing a channel
* with the Channel starting frequency above 45 GHz. * with the Channel starting frequency above 45 GHz.
*/ */
u32 limit = freq_khz > 45 * ONE_GHZ_IN_KHZ ? u32 limit = freq_khz > 45 * KHZ_PER_GHZ ? 20 * KHZ_PER_GHZ : 2 * KHZ_PER_GHZ;
20 * ONE_GHZ_IN_KHZ : 2 * ONE_GHZ_IN_KHZ;
if (abs(freq_khz - freq_range->start_freq_khz) <= limit) if (abs(freq_khz - freq_range->start_freq_khz) <= limit)
return true; return true;
if (abs(freq_khz - freq_range->end_freq_khz) <= limit) if (abs(freq_khz - freq_range->end_freq_khz) <= limit)
return true; return true;
return false; return false;
#undef ONE_GHZ_IN_KHZ
} }
/* /*