Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cfg80211: express channels with a KHz component

Browse source 
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>
Git-commit: 934f4c7dd3a544bb8000f7436f1f0e12e04ebc37
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
CRs-Fixed: 2743684
Change-Id: Ib50d4946c6edab98efd9626dbcbae5ee3d905a78
Signed-off-by: Vinita S. Maloo <vmaloo@codeaurora.org>
This commit is contained in:
Thomas Pedersen 2020-04-01 18:18:03 -07:00 committed by Gerrit - the friendly Code Review server
parent 7a9151c900
commit 067ede6477
6 changed files with 182 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
include/net/cfg80211.h
View file

@ -159,6 +159,7 @@ enum ieee80211_channel_flags {
* with cfg80211. * with cfg80211.
* *
* @center_freq: center frequency in MHz * @center_freq: center frequency in MHz
* @freq_offset: offset from @center_freq, in KHz
* @hw_value: hardware-specific value for the channel * @hw_value: hardware-specific value for the channel
* @flags: channel flags from &enum ieee80211_channel_flags. * @flags: channel flags from &enum ieee80211_channel_flags.
* @orig_flags: channel flags at registration time, used by regulatory * @orig_flags: channel flags at registration time, used by regulatory
@ -180,6 +181,7 @@ enum ieee80211_channel_flags {
struct ieee80211_channel { struct ieee80211_channel {
enum nl80211_band band; enum nl80211_band band;
u32 center_freq; u32 center_freq;
u16 freq_offset;
u16 hw_value; u16 hw_value;
u32 flags; u32 flags;
int max_antenna_gain; int max_antenna_gain;
@ -591,6 +593,7 @@ struct key_params {
* If edmg is requested (i.e. the .channels member is non-zero), * If edmg is requested (i.e. the .channels member is non-zero),
* chan will define the primary channel and all other * chan will define the primary channel and all other
* parameters are ignored. * parameters are ignored.
* @freq1_offset: offset from @center_freq1, in KHz
*/ */
struct cfg80211_chan_def { struct cfg80211_chan_def {
struct ieee80211_channel *chan; struct ieee80211_channel *chan;
@ -598,6 +601,7 @@ struct cfg80211_chan_def {
u32 center_freq1; u32 center_freq1;
u32 center_freq2; u32 center_freq2;
struct ieee80211_edmg edmg; struct ieee80211_edmg edmg;
u16 freq1_offset;
}; };
/** /**
@ -652,6 +656,7 @@ cfg80211_chandef_identical(const struct cfg80211_chan_def *chandef1,
return (chandef1->chan == chandef2->chan && return (chandef1->chan == chandef2->chan &&
chandef1->width == chandef2->width && chandef1->width == chandef2->width &&
chandef1->center_freq1 == chandef2->center_freq1 && chandef1->center_freq1 == chandef2->center_freq1 &&
chandef1->freq1_offset == chandef2->freq1_offset &&
chandef1->center_freq2 == chandef2->center_freq2); chandef1->center_freq2 == chandef2->center_freq2);
} }
@ -4642,30 +4647,92 @@ static inline void *wdev_priv(struct wireless_dev *wdev)
* cfg80211 offers a number of utility functions that can be useful. * cfg80211 offers a number of utility functions that can be useful.
*/ */
/**
* ieee80211_channel_equal - compare two struct ieee80211_channel
*
* @a: 1st struct ieee80211_channel
* @b: 2nd struct ieee80211_channel
* Return: true if center frequency of @a == @b
*/
static inline bool
ieee80211_channel_equal(struct ieee80211_channel *a,
struct ieee80211_channel *b)
{
return (a->center_freq == b->center_freq &&
a->freq_offset == b->freq_offset);
}
/**
* ieee80211_channel_to_khz - convert ieee80211_channel to frequency in KHz
* @chan: struct ieee80211_channel to convert
* Return: The corresponding frequency (in KHz)
*/
static inline u32
ieee80211_channel_to_khz(const struct ieee80211_channel *chan)
{
return MHZ_TO_KHZ(chan->center_freq) + chan->freq_offset;
}
/**
* ieee80211_channel_to_freq_khz - convert channel number to frequency
* @chan: channel number
* @band: band, necessary due to channel number overlap
* Return: The corresponding frequency (in KHz), or 0 if the conversion failed.
*/
u32 ieee80211_channel_to_freq_khz(int chan, enum nl80211_band band);
/** /**
* ieee80211_channel_to_frequency - convert channel number to frequency * ieee80211_channel_to_frequency - convert channel number to frequency
* @chan: channel number * @chan: channel number
* @band: band, necessary due to channel number overlap * @band: band, necessary due to channel number overlap
* Return: The corresponding frequency (in MHz), or 0 if the conversion failed. * Return: The corresponding frequency (in MHz), or 0 if the conversion failed.
*/ */
int ieee80211_channel_to_frequency(int chan, enum nl80211_band band); static inline int
ieee80211_channel_to_frequency(int chan, enum nl80211_band band)
{
return KHZ_TO_MHZ(ieee80211_channel_to_freq_khz(chan, band));
}
/**
* ieee80211_freq_khz_to_channel - convert frequency to channel number
* @freq: center frequency in KHz
* Return: The corresponding channel, or 0 if the conversion failed.
*/
int ieee80211_freq_khz_to_channel(u32 freq);
/** /**
* ieee80211_frequency_to_channel - convert frequency to channel number * ieee80211_frequency_to_channel - convert frequency to channel number
* @freq: center frequency * @freq: center frequency in MHz
* Return: The corresponding channel, or 0 if the conversion failed. * Return: The corresponding channel, or 0 if the conversion failed.
*/ */
int ieee80211_frequency_to_channel(int freq); static inline int
ieee80211_frequency_to_channel(int freq)
{
return ieee80211_freq_khz_to_channel(MHZ_TO_KHZ(freq));
}
/**
* ieee80211_get_channel_khz - get channel struct from wiphy for specified
* frequency
* @wiphy: the struct wiphy to get the channel for
* @freq: the center frequency (in KHz) of the channel
* Return: The channel struct from @wiphy at @freq.
*/
struct ieee80211_channel *
ieee80211_get_channel_khz(struct wiphy *wiphy, u32 freq);
/** /**
* ieee80211_get_channel - get channel struct from wiphy for specified frequency * ieee80211_get_channel - get channel struct from wiphy for specified frequency
* *
* @wiphy: the struct wiphy to get the channel for * @wiphy: the struct wiphy to get the channel for
* @freq: the center frequency of the channel * @freq: the center frequency (in MHz) of the channel
*
* Return: The channel struct from @wiphy at @freq. * Return: The channel struct from @wiphy at @freq.
*/ */
struct ieee80211_channel *ieee80211_get_channel(struct wiphy *wiphy, int freq); static inline struct ieee80211_channel *
ieee80211_get_channel(struct wiphy *wiphy, int freq)
{
return ieee80211_get_channel_khz(wiphy, MHZ_TO_KHZ(freq));
}
/** /**
* ieee80211_get_response_rate - get basic rate for a given rate * ieee80211_get_response_rate - get basic rate for a given rate
@ -6573,6 +6640,19 @@ bool ieee80211_operating_class_to_band(u8 operating_class,
bool ieee80211_chandef_to_operating_class(struct cfg80211_chan_def *chandef, bool ieee80211_chandef_to_operating_class(struct cfg80211_chan_def *chandef,
u8 *op_class); u8 *op_class);
/**
* ieee80211_chandef_to_khz - convert chandef to frequency in KHz
*
* @chandef: the chandef to convert
*
* Returns the center frequency of chandef (1st segment) in KHz.
*/
static inline u32
ieee80211_chandef_to_khz(const struct cfg80211_chan_def *chandef)
{
return MHZ_TO_KHZ(chandef->center_freq1) + chandef->freq1_offset;
}
/* /*
* cfg80211_tdls_oper_request - request userspace to perform TDLS operation * cfg80211_tdls_oper_request - request userspace to perform TDLS operation
* @dev: the device on which the operation is requested * @dev: the device on which the operation is requested

68
net/wireless/chan.c
View file

@ -26,6 +26,7 @@ void cfg80211_chandef_create(struct cfg80211_chan_def *chandef,
return; return;
chandef->chan = chan; chandef->chan = chan;
chandef->freq1_offset = chan->freq_offset;
chandef->center_freq2 = 0; chandef->center_freq2 = 0;
chandef->edmg.bw_config = 0; chandef->edmg.bw_config = 0;
chandef->edmg.channels = 0; chandef->edmg.channels = 0;
@ -152,7 +153,8 @@ bool cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef)
case NL80211_CHAN_WIDTH_10: case NL80211_CHAN_WIDTH_10:
case NL80211_CHAN_WIDTH_20: case NL80211_CHAN_WIDTH_20:
case NL80211_CHAN_WIDTH_20_NOHT: case NL80211_CHAN_WIDTH_20_NOHT:
if (chandef->center_freq1 != control_freq) if (ieee80211_chandef_to_khz(chandef) !=
ieee80211_channel_to_khz(chandef->chan))
return false; return false;
if (chandef->center_freq2) if (chandef->center_freq2)
return false; return false;
@ -380,10 +382,11 @@ static u32 cfg80211_get_start_freq(u32 center_freq,
{ {
u32 start_freq; u32 start_freq;
if (bandwidth <= 20) bandwidth = MHZ_TO_KHZ(bandwidth);
if (bandwidth <= MHZ_TO_KHZ(20))
start_freq = center_freq; start_freq = center_freq;
else else
start_freq = center_freq - bandwidth/2 + 10; start_freq = center_freq - bandwidth / 2 + MHZ_TO_KHZ(10);
return start_freq; return start_freq;
} }
@ -393,10 +396,11 @@ static u32 cfg80211_get_end_freq(u32 center_freq,
{ {
u32 end_freq; u32 end_freq;
if (bandwidth <= 20) bandwidth = MHZ_TO_KHZ(bandwidth);
if (bandwidth <= MHZ_TO_KHZ(20))
end_freq = center_freq; end_freq = center_freq;
else else
end_freq = center_freq + bandwidth/2 - 10; end_freq = center_freq + bandwidth / 2 - MHZ_TO_KHZ(10);
return end_freq; return end_freq;
} }
@ -411,8 +415,8 @@ static int cfg80211_get_chans_dfs_required(struct wiphy *wiphy,
start_freq = cfg80211_get_start_freq(center_freq, bandwidth); start_freq = cfg80211_get_start_freq(center_freq, bandwidth);
end_freq = cfg80211_get_end_freq(center_freq, bandwidth); end_freq = cfg80211_get_end_freq(center_freq, bandwidth);
for (freq = start_freq; freq <= end_freq; freq += 20) { for (freq = start_freq; freq <= end_freq; freq += MHZ_TO_KHZ(20)) {
c = ieee80211_get_channel(wiphy, freq); c = ieee80211_get_channel_khz(wiphy, freq);
if (!c) if (!c)
return -EINVAL; return -EINVAL;
@ -443,8 +447,8 @@ int cfg80211_chandef_dfs_required(struct wiphy *wiphy,
return -EINVAL; return -EINVAL;
ret = cfg80211_get_chans_dfs_required(wiphy, ret = cfg80211_get_chans_dfs_required(wiphy,
chandef->center_freq1, ieee80211_chandef_to_khz(chandef),
width); width);
if (ret < 0) if (ret < 0)
return ret; return ret;
else if (ret > 0) else if (ret > 0)
@ -454,8 +458,8 @@ int cfg80211_chandef_dfs_required(struct wiphy *wiphy,
return 0; return 0;
ret = cfg80211_get_chans_dfs_required(wiphy, ret = cfg80211_get_chans_dfs_required(wiphy,
chandef->center_freq2, MHZ_TO_KHZ(chandef->center_freq2),
width); width);
if (ret < 0) if (ret < 0)
return ret; return ret;
else if (ret > 0) else if (ret > 0)
@ -497,8 +501,8 @@ static int cfg80211_get_chans_dfs_usable(struct wiphy *wiphy,
* DFS_AVAILABLE). Return number of usable channels * DFS_AVAILABLE). Return number of usable channels
* (require CAC). Allow DFS and non-DFS channel mix. * (require CAC). Allow DFS and non-DFS channel mix.
*/ */
for (freq = start_freq; freq <= end_freq; freq += 20) { for (freq = start_freq; freq <= end_freq; freq += MHZ_TO_KHZ(20)) {
c = ieee80211_get_channel(wiphy, freq); c = ieee80211_get_channel_khz(wiphy, freq);
if (!c) if (!c)
return -EINVAL; return -EINVAL;
@ -530,8 +534,9 @@ bool cfg80211_chandef_dfs_usable(struct wiphy *wiphy,
if (width < 0) if (width < 0)
return false; return false;
r1 = cfg80211_get_chans_dfs_usable(wiphy, chandef->center_freq1, r1 = cfg80211_get_chans_dfs_usable(wiphy,
width); MHZ_TO_KHZ(chandef->center_freq1),
width);
if (r1 < 0) if (r1 < 0)
return false; return false;
@ -540,8 +545,8 @@ bool cfg80211_chandef_dfs_usable(struct wiphy *wiphy,
case NL80211_CHAN_WIDTH_80P80: case NL80211_CHAN_WIDTH_80P80:
WARN_ON(!chandef->center_freq2); WARN_ON(!chandef->center_freq2);
r2 = cfg80211_get_chans_dfs_usable(wiphy, r2 = cfg80211_get_chans_dfs_usable(wiphy,
chandef->center_freq2, MHZ_TO_KHZ(chandef->center_freq2),
width); width);
if (r2 < 0) if (r2 < 0)
return false; return false;
break; break;
@ -688,8 +693,8 @@ static bool cfg80211_get_chans_dfs_available(struct wiphy *wiphy,
* If any channel in between is disabled or has not * If any channel in between is disabled or has not
* had gone through CAC return false * had gone through CAC return false
*/ */
for (freq = start_freq; freq <= end_freq; freq += 20) { for (freq = start_freq; freq <= end_freq; freq += MHZ_TO_KHZ(20)) {
c = ieee80211_get_channel(wiphy, freq); c = ieee80211_get_channel_khz(wiphy, freq);
if (!c) if (!c)
return false; return false;
@ -718,7 +723,8 @@ static bool cfg80211_chandef_dfs_available(struct wiphy *wiphy,
if (width < 0) if (width < 0)
return false; return false;
r = cfg80211_get_chans_dfs_available(wiphy, chandef->center_freq1, r = cfg80211_get_chans_dfs_available(wiphy,
MHZ_TO_KHZ(chandef->center_freq1),
width); width);
/* If any of channels unavailable for cf1 just return */ /* If any of channels unavailable for cf1 just return */
@ -729,8 +735,8 @@ static bool cfg80211_chandef_dfs_available(struct wiphy *wiphy,
case NL80211_CHAN_WIDTH_80P80: case NL80211_CHAN_WIDTH_80P80:
WARN_ON(!chandef->center_freq2); WARN_ON(!chandef->center_freq2);
r = cfg80211_get_chans_dfs_available(wiphy, r = cfg80211_get_chans_dfs_available(wiphy,
chandef->center_freq2, MHZ_TO_KHZ(chandef->center_freq2),
width); width);
break; break;
default: default:
WARN_ON(chandef->center_freq2); WARN_ON(chandef->center_freq2);
@ -751,8 +757,8 @@ static unsigned int cfg80211_get_chans_dfs_cac_time(struct wiphy *wiphy,
start_freq = cfg80211_get_start_freq(center_freq, bandwidth); start_freq = cfg80211_get_start_freq(center_freq, bandwidth);
end_freq = cfg80211_get_end_freq(center_freq, bandwidth); end_freq = cfg80211_get_end_freq(center_freq, bandwidth);
for (freq = start_freq; freq <= end_freq; freq += 20) { for (freq = start_freq; freq <= end_freq; freq += MHZ_TO_KHZ(20)) {
c = ieee80211_get_channel(wiphy, freq); c = ieee80211_get_channel_khz(wiphy, freq);
if (!c) if (!c)
return 0; return 0;
@ -784,14 +790,14 @@ cfg80211_chandef_dfs_cac_time(struct wiphy *wiphy,
return 0; return 0;
t1 = cfg80211_get_chans_dfs_cac_time(wiphy, t1 = cfg80211_get_chans_dfs_cac_time(wiphy,
chandef->center_freq1, MHZ_TO_KHZ(chandef->center_freq1),
width); width);
if (!chandef->center_freq2) if (!chandef->center_freq2)
return t1; return t1;
t2 = cfg80211_get_chans_dfs_cac_time(wiphy, t2 = cfg80211_get_chans_dfs_cac_time(wiphy,
chandef->center_freq2, MHZ_TO_KHZ(chandef->center_freq2),
width); width);
return max(t1, t2); return max(t1, t2);
@ -807,8 +813,8 @@ static bool cfg80211_secondary_chans_ok(struct wiphy *wiphy,
start_freq = cfg80211_get_start_freq(center_freq, bandwidth); start_freq = cfg80211_get_start_freq(center_freq, bandwidth);
end_freq = cfg80211_get_end_freq(center_freq, bandwidth); end_freq = cfg80211_get_end_freq(center_freq, bandwidth);
for (freq = start_freq; freq <= end_freq; freq += 20) { for (freq = start_freq; freq <= end_freq; freq += MHZ_TO_KHZ(20)) {
c = ieee80211_get_channel(wiphy, freq); c = ieee80211_get_channel_khz(wiphy, freq);
if (!c || c->flags & prohibited_flags) if (!c || c->flags & prohibited_flags)
return false; return false;
} }
@ -968,13 +974,15 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy,
prohibited_flags |= IEEE80211_CHAN_NO_OFDM; prohibited_flags |= IEEE80211_CHAN_NO_OFDM;
if (!cfg80211_secondary_chans_ok(wiphy, chandef->center_freq1, if (!cfg80211_secondary_chans_ok(wiphy,
ieee80211_chandef_to_khz(chandef),
width, prohibited_flags)) width, prohibited_flags))
return false; return false;
if (!chandef->center_freq2) if (!chandef->center_freq2)
return true; return true;
return cfg80211_secondary_chans_ok(wiphy, chandef->center_freq2, return cfg80211_secondary_chans_ok(wiphy,
MHZ_TO_KHZ(chandef->center_freq2),
width, prohibited_flags); width, prohibited_flags);
} }
EXPORT_SYMBOL(cfg80211_chandef_usable); EXPORT_SYMBOL(cfg80211_chandef_usable);

40
net/wireless/reg.c
View file

@ -1691,22 +1691,23 @@ static uint32_t reg_rule_to_chan_bw_flags(const struct ieee80211_regdomain *regd
const struct ieee80211_channel *chan) const struct ieee80211_channel *chan)
{ {
const struct ieee80211_freq_range *freq_range = NULL; const struct ieee80211_freq_range *freq_range = NULL;
u32 max_bandwidth_khz, bw_flags = 0; u32 max_bandwidth_khz, center_freq_khz, bw_flags = 0;
freq_range = &reg_rule->freq_range; freq_range = &reg_rule->freq_range;
max_bandwidth_khz = freq_range->max_bandwidth_khz; max_bandwidth_khz = freq_range->max_bandwidth_khz;
center_freq_khz = ieee80211_channel_to_khz(chan);
/* Check if auto calculation requested */ /* Check if auto calculation requested */
if (reg_rule->flags & NL80211_RRF_AUTO_BW) if (reg_rule->flags & NL80211_RRF_AUTO_BW)
max_bandwidth_khz = reg_get_max_bandwidth(regd, reg_rule); max_bandwidth_khz = reg_get_max_bandwidth(regd, reg_rule);
/* If we get a reg_rule we can assume that at least 5Mhz fit */ /* If we get a reg_rule we can assume that at least 5Mhz fit */
if (!cfg80211_does_bw_fit_range(freq_range, if (!cfg80211_does_bw_fit_range(freq_range,
MHZ_TO_KHZ(chan->center_freq), center_freq_khz,
MHZ_TO_KHZ(10))) MHZ_TO_KHZ(10)))
bw_flags |= IEEE80211_CHAN_NO_10MHZ; bw_flags |= IEEE80211_CHAN_NO_10MHZ;
if (!cfg80211_does_bw_fit_range(freq_range, if (!cfg80211_does_bw_fit_range(freq_range,
MHZ_TO_KHZ(chan->center_freq), center_freq_khz,
MHZ_TO_KHZ(20))) MHZ_TO_KHZ(20)))
bw_flags |= IEEE80211_CHAN_NO_20MHZ; bw_flags |= IEEE80211_CHAN_NO_20MHZ;
@ -1743,7 +1744,7 @@ static void handle_channel(struct wiphy *wiphy,
flags = chan->orig_flags; flags = chan->orig_flags;
reg_rule = freq_reg_info(wiphy, MHZ_TO_KHZ(chan->center_freq)); reg_rule = freq_reg_info(wiphy, ieee80211_channel_to_khz(chan));
if (IS_ERR(reg_rule)) { if (IS_ERR(reg_rule)) {
/* /*
* We will disable all channels that do not match our * We will disable all channels that do not match our
@ -1762,13 +1763,13 @@ static void handle_channel(struct wiphy *wiphy,
if (lr->initiator == NL80211_REGDOM_SET_BY_DRIVER && if (lr->initiator == NL80211_REGDOM_SET_BY_DRIVER &&
request_wiphy && request_wiphy == wiphy && request_wiphy && request_wiphy == wiphy &&
request_wiphy->regulatory_flags & REGULATORY_STRICT_REG) { request_wiphy->regulatory_flags & REGULATORY_STRICT_REG) {
pr_debug("Disabling freq %d MHz for good\n", pr_debug("Disabling freq %d.%03d MHz for good\n",
chan->center_freq); chan->center_freq, chan->freq_offset);
chan->orig_flags |= IEEE80211_CHAN_DISABLED; chan->orig_flags |= IEEE80211_CHAN_DISABLED;
chan->flags = chan->orig_flags; chan->flags = chan->orig_flags;
} else { } else {
pr_debug("Disabling freq %d MHz\n", pr_debug("Disabling freq %d.%03d MHz\n",
chan->center_freq); chan->center_freq, chan->freq_offset);
chan->flags |= IEEE80211_CHAN_DISABLED; chan->flags |= IEEE80211_CHAN_DISABLED;
} }
return; return;
@ -1969,7 +1970,7 @@ static void handle_reg_beacon(struct wiphy *wiphy, unsigned int chan_idx,
sband = wiphy->bands[reg_beacon->chan.band]; sband = wiphy->bands[reg_beacon->chan.band];
chan = &sband->channels[chan_idx]; chan = &sband->channels[chan_idx];
if (likely(chan->center_freq != reg_beacon->chan.center_freq)) if (likely(!ieee80211_channel_equal(chan, &reg_beacon->chan)))
return; return;
if (chan->beacon_found) if (chan->beacon_found)
@ -2302,18 +2303,18 @@ static void handle_channel_custom(struct wiphy *wiphy,
u32 bw_flags = 0; u32 bw_flags = 0;
const struct ieee80211_reg_rule *reg_rule = NULL; const struct ieee80211_reg_rule *reg_rule = NULL;
const struct ieee80211_power_rule *power_rule = NULL; const struct ieee80211_power_rule *power_rule = NULL;
u32 bw; u32 bw, center_freq_khz;
center_freq_khz = ieee80211_channel_to_khz(chan);
for (bw = MHZ_TO_KHZ(20); bw >= min_bw; bw = bw / 2) { for (bw = MHZ_TO_KHZ(20); bw >= min_bw; bw = bw / 2) {
reg_rule = freq_reg_info_regd(MHZ_TO_KHZ(chan->center_freq), reg_rule = freq_reg_info_regd(center_freq_khz, regd, bw);
regd, bw);
if (!IS_ERR(reg_rule)) if (!IS_ERR(reg_rule))
break; break;
} }
if (IS_ERR_OR_NULL(reg_rule)) { if (IS_ERR_OR_NULL(reg_rule)) {
pr_debug("Disabling freq %d MHz as custom regd has no rule that fits it\n", pr_debug("Disabling freq %d.%03d MHz as custom regd has no rule that fits it\n",
chan->center_freq); chan->center_freq, chan->freq_offset);
if (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED) { if (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED) {
chan->flags |= IEEE80211_CHAN_DISABLED; chan->flags |= IEEE80211_CHAN_DISABLED;
} else { } else {
@ -3354,8 +3355,8 @@ static bool pending_reg_beacon(struct ieee80211_channel *beacon_chan)
struct reg_beacon *pending_beacon; struct reg_beacon *pending_beacon;
list_for_each_entry(pending_beacon, &reg_pending_beacons, list) list_for_each_entry(pending_beacon, &reg_pending_beacons, list)
if (beacon_chan->center_freq == if (ieee80211_channel_equal(beacon_chan,
pending_beacon->chan.center_freq) &pending_beacon->chan))
return true; return true;
return false; return false;
} }
@ -3384,9 +3385,10 @@ int regulatory_hint_found_beacon(struct wiphy *wiphy,
if (!reg_beacon) if (!reg_beacon)
return -ENOMEM; return -ENOMEM;
pr_debug("Found new beacon on frequency: %d MHz (Ch %d) on %s\n", pr_debug("Found new beacon on frequency: %d.%03d MHz (Ch %d) on %s\n",
beacon_chan->center_freq, beacon_chan->center_freq, beacon_chan->freq_offset,
ieee80211_frequency_to_channel(beacon_chan->center_freq), ieee80211_freq_khz_to_channel(
ieee80211_channel_to_khz(beacon_chan)),
wiphy_name(wiphy)); wiphy_name(wiphy));
memcpy(&reg_beacon->chan, beacon_chan, memcpy(&reg_beacon->chan, beacon_chan,

4
net/wireless/scan.c
View file

@ -1253,8 +1253,8 @@ cfg80211_get_bss_channel(struct wiphy *wiphy, const u8 *ie, size_t ielen,
return channel; return channel;
} }
freq = ieee80211_channel_to_frequency(channel_number, channel->band); freq = ieee80211_channel_to_freq_khz(channel_number, channel->band);
alt_channel = ieee80211_get_channel(wiphy, freq); alt_channel = ieee80211_get_channel_khz(wiphy, freq);
if (!alt_channel) { if (!alt_channel) {
if (channel->band == NL80211_BAND_2GHZ) { if (channel->band == NL80211_BAND_2GHZ) {
/* /*

21
net/wireless/trace.h
View file

@ -112,24 +112,29 @@
} while (0) } while (0)
#define CHAN_ENTRY __field(enum nl80211_band, band) \ #define CHAN_ENTRY __field(enum nl80211_band, band) \
__field(u32, center_freq) __field(u32, center_freq) \
__field(u16, freq_offset)
#define CHAN_ASSIGN(chan) \ #define CHAN_ASSIGN(chan) \
do { \ do { \
if (chan) { \ if (chan) { \
__entry->band = chan->band; \ __entry->band = chan->band; \
__entry->center_freq = chan->center_freq; \ __entry->center_freq = chan->center_freq; \
__entry->freq_offset = chan->freq_offset; \
} else { \ } else { \
__entry->band = 0; \ __entry->band = 0; \
__entry->center_freq = 0; \ __entry->center_freq = 0; \
__entry->freq_offset = 0; \
} \ } \
} while (0) } while (0)
#define CHAN_PR_FMT "band: %d, freq: %u" #define CHAN_PR_FMT "band: %d, freq: %u.%03u"
#define CHAN_PR_ARG __entry->band, __entry->center_freq #define CHAN_PR_ARG __entry->band, __entry->center_freq, __entry->freq_offset
#define CHAN_DEF_ENTRY __field(enum nl80211_band, band) \ #define CHAN_DEF_ENTRY __field(enum nl80211_band, band) \
__field(u32, control_freq) \ __field(u32, control_freq) \
__field(u32, freq_offset) \
__field(u32, width) \ __field(u32, width) \
__field(u32, center_freq1) \ __field(u32, center_freq1) \
__field(u32, freq1_offset) \
__field(u32, center_freq2) __field(u32, center_freq2)
#define CHAN_DEF_ASSIGN(chandef) \ #define CHAN_DEF_ASSIGN(chandef) \
do { \ do { \
@ -137,21 +142,27 @@
__entry->band = (chandef)->chan->band; \ __entry->band = (chandef)->chan->band; \
__entry->control_freq = \ __entry->control_freq = \
(chandef)->chan->center_freq; \ (chandef)->chan->center_freq; \
__entry->freq_offset = \
(chandef)->chan->freq_offset; \
__entry->width = (chandef)->width; \ __entry->width = (chandef)->width; \
__entry->center_freq1 = (chandef)->center_freq1;\ __entry->center_freq1 = (chandef)->center_freq1;\
__entry->freq1_offset = (chandef)->freq1_offset;\
__entry->center_freq2 = (chandef)->center_freq2;\ __entry->center_freq2 = (chandef)->center_freq2;\
} else { \ } else { \
__entry->band = 0; \ __entry->band = 0; \
__entry->control_freq = 0; \ __entry->control_freq = 0; \
__entry->freq_offset = 0; \
__entry->width = 0; \ __entry->width = 0; \
__entry->center_freq1 = 0; \ __entry->center_freq1 = 0; \
__entry->freq1_offset = 0; \
__entry->center_freq2 = 0; \ __entry->center_freq2 = 0; \
} \ } \
} while (0) } while (0)
#define CHAN_DEF_PR_FMT \ #define CHAN_DEF_PR_FMT \
"band: %d, control freq: %u, width: %d, cf1: %u, cf2: %u" "band: %d, control freq: %u.%03u, width: %d, cf1: %u.%03u, cf2: %u"
#define CHAN_DEF_PR_ARG __entry->band, __entry->control_freq, \ #define CHAN_DEF_PR_ARG __entry->band, __entry->control_freq, \
__entry->width, __entry->center_freq1, \ __entry->freq_offset, __entry->width, \
__entry->center_freq1, __entry->freq1_offset, \
__entry->center_freq2 __entry->center_freq2
#define SINFO_ENTRY __field(int, generation) \ #define SINFO_ENTRY __field(int, generation) \

32
net/wireless/util.c
View file

@ -68,7 +68,7 @@ u32 ieee80211_mandatory_rates(struct ieee80211_supported_band *sband,
} }
EXPORT_SYMBOL(ieee80211_mandatory_rates); EXPORT_SYMBOL(ieee80211_mandatory_rates);
int ieee80211_channel_to_frequency(int chan, enum nl80211_band band) u32 ieee80211_channel_to_freq_khz(int chan, enum nl80211_band band)
{ {
/* see 802.11 17.3.8.3.2 and Annex J /* see 802.11 17.3.8.3.2 and Annex J
* there are overlapping channel numbers in 5GHz and 2GHz bands */ * there are overlapping channel numbers in 5GHz and 2GHz bands */
@ -77,15 +77,15 @@ int ieee80211_channel_to_frequency(int chan, enum nl80211_band band)
switch (band) { switch (band) {
case NL80211_BAND_2GHZ: case NL80211_BAND_2GHZ:
if (chan == 14) if (chan == 14)
return 2484; return MHZ_TO_KHZ(2484);
else if (chan < 14) else if (chan < 14)
return 2407 + chan * 5; return MHZ_TO_KHZ(2407 + chan * 5);
break; break;
case NL80211_BAND_5GHZ: case NL80211_BAND_5GHZ:
if (chan >= 182 && chan <= 196) if (chan >= 182 && chan <= 196)
return 4000 + chan * 5; return MHZ_TO_KHZ(4000 + chan * 5);
else else
return 5000 + chan * 5; return MHZ_TO_KHZ(5000 + chan * 5);
break; break;
case NL80211_BAND_6GHZ: case NL80211_BAND_6GHZ:
/* see 802.11ax D4.1 27.3.22.2 */ /* see 802.11ax D4.1 27.3.22.2 */
@ -94,17 +94,20 @@ int ieee80211_channel_to_frequency(int chan, enum nl80211_band band)
break; break;
case NL80211_BAND_60GHZ: case NL80211_BAND_60GHZ:
if (chan < 7) if (chan < 7)
return 56160 + chan * 2160; return MHZ_TO_KHZ(56160 + chan * 2160);
break; break;
default: default:
; ;
} }
return 0; /* not supported */ return 0; /* not supported */
} }
EXPORT_SYMBOL(ieee80211_channel_to_frequency); EXPORT_SYMBOL(ieee80211_channel_to_freq_khz);
int ieee80211_frequency_to_channel(int freq) int ieee80211_freq_khz_to_channel(u32 freq)
{ {
/* TODO: just handle MHz for now */
freq = KHZ_TO_MHZ(freq);
/* see 802.11 17.3.8.3.2 and Annex J */ /* see 802.11 17.3.8.3.2 and Annex J */
if (freq == 2484) if (freq == 2484)
return 14; return 14;
@ -122,9 +125,10 @@ int ieee80211_frequency_to_channel(int freq)
else else
return 0; return 0;
} }
EXPORT_SYMBOL(ieee80211_frequency_to_channel); EXPORT_SYMBOL(ieee80211_freq_khz_to_channel);
struct ieee80211_channel *ieee80211_get_channel(struct wiphy *wiphy, int freq) struct ieee80211_channel *ieee80211_get_channel_khz(struct wiphy *wiphy,
u32 freq)
{ {
enum nl80211_band band; enum nl80211_band band;
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
@ -137,14 +141,16 @@ struct ieee80211_channel *ieee80211_get_channel(struct wiphy *wiphy, int freq)
continue; continue;
for (i = 0; i < sband->n_channels; i++) { for (i = 0; i < sband->n_channels; i++) {
if (sband->channels[i].center_freq == freq) struct ieee80211_channel *chan = &sband->channels[i];
return &sband->channels[i];
if (ieee80211_channel_to_khz(chan) == freq)
return chan;
} }
} }
return NULL; return NULL;
} }
EXPORT_SYMBOL(ieee80211_get_channel); EXPORT_SYMBOL(ieee80211_get_channel_khz);
static void set_mandatory_flags_band(struct ieee80211_supported_band *sband) static void set_mandatory_flags_band(struct ieee80211_supported_band *sband)
{ {