diff options
| author |   Thomas Pedersen <thomas@adapt-ip.com> | 2020-04-01 18:18:03 -0700 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2020-04-24 12:33:43 +0200 |
| commit | 934f4c7dd3a544bb8000f7436f1f0e12e04ebc37 (patch) | |
| tree | 3a852cedb96aa510836d1f1fe5810297fbeac29e /net/wireless/scan.c | |
| parent | ieee80211: share 802.11 unit conversion helpers (diff) | |
| download | linux-dev-934f4c7dd3a544bb8000f7436f1f0e12e04ebc37.tar.xz linux-dev-934f4c7dd3a544bb8000f7436f1f0e12e04ebc37.zip | |
cfg80211: express channels with a KHz component
Some bands (S1G) define channels centered on a non-integer
MHz. Give ieee80211_channel and cfg80211_chan_def a
freq_offset component where the final frequency can be
expressed as:
MHZ_TO_KHZ(chan->center_freq) + chan->freq_offset;
Also provide some helper functions to do the frequency
conversion and test for equality.
Retain the existing interface to frequency and channel
conversion helpers, and expose new ones which handle
frequencies in units of KHz.
Some internal functions (net/wireless/chan.c) pass around
a frequency value. Convert these to units of KHz.
mesh, ibss, wext, etc. are currently ignored.
Signed-off-by: Thomas Pedersen <thomas@adapt-ip.com>
Link: https://lore.kernel.org/r/20200402011810.22947-3-thomas@adapt-ip.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/scan.c')
| -rw-r--r-- | net/wireless/scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 4000382aef48..74ea4cfb39fb 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -1322,8 +1322,8 @@ cfg80211_get_bss_channel(struct wiphy *wiphy, const u8 *ie, size_t ielen, return channel; } - freq = ieee80211_channel_to_frequency(channel_number, channel->band); - alt_channel = ieee80211_get_channel(wiphy, freq); + freq = ieee80211_channel_to_freq_khz(channel_number, channel->band); + alt_channel = ieee80211_get_channel_khz(wiphy, freq); if (!alt_channel) { if (channel->band == NL80211_BAND_2GHZ) { /* |