mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-22 01:08:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

wifi: cfg80211: add helper for parsing NPCA to chandef

Browse Source 
Add a cfg80211_chandef_add_npca() helper function that takes an
existing chandef without NPCA and sets the NPCA information from
the format used in UHR operation and UHR Parameters Update.

Link: https://patch.msgid.link/20260428112708.5cdc4e69a306.I95d396ac671da438f340b1afb735ebfe33164894@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg
2026-04-28 11:25:33 +02:00
parent 1cf1d06e95
commit 3ca884399b
2 changed files with 59 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/net/cfg80211.h
View File

@@ -1154,6 +1154,19 @@ int cfg80211_chandef_primary(const struct cfg80211_chan_def *chandef,
enum nl80211_chan_width primary_chan_width,
u16 *punctured);
/**
* cfg80211_chandef_add_npca - parse and add NPCA information to chandef
* @wiphy: the wiphy this will be used for, for channel pointer lookup
* @chandef: the chandef to modify, must be a valid chandef without NPCA
* @npca: the NPCA information, can be %NULL
*
* Returns: 0 if the NPCA information was added and the resulting
* chandef is valid, a negative error code on errors
*/
int cfg80211_chandef_add_npca(struct wiphy *wiphy,
struct cfg80211_chan_def *chandef,
const struct ieee80211_uhr_npca_info *npca);
/**
* nl80211_send_chandef - sends the channel definition.
* @msg: the msg to send channel definition

46
net/wireless/chan.c
View File

@@ -556,6 +556,52 @@ int cfg80211_chandef_primary(const struct cfg80211_chan_def *c,
}
EXPORT_SYMBOL(cfg80211_chandef_primary);
int cfg80211_chandef_add_npca(struct wiphy *wiphy,
struct cfg80211_chan_def *chandef,
const struct ieee80211_uhr_npca_info *npca)
{
struct cfg80211_chan_def new_chandef = *chandef;
u32 width, npca_freq;
u8 offs;
if (chandef->npca_chan || chandef->npca_punctured)
return -EINVAL;
if (WARN_ON(!cfg80211_chandef_valid(chandef)))
return -EINVAL;
if (!npca)
return 0;
switch (chandef->width) {
case NL80211_CHAN_WIDTH_80:
case NL80211_CHAN_WIDTH_160:
case NL80211_CHAN_WIDTH_320:
break;
default:
return -EINVAL;
}
offs = le32_get_bits(npca->params,
IEEE80211_UHR_NPCA_PARAMS_PRIMARY_CHAN_OFFS);
width = cfg80211_chandef_get_width(chandef);
npca_freq = chandef->center_freq1 - width / 2 + 10 + 20 * offs;
new_chandef.npca_chan = ieee80211_get_channel(wiphy, npca_freq);
if (!new_chandef.npca_chan)
return -EINVAL;
if (npca->params & cpu_to_le32(IEEE80211_UHR_NPCA_PARAMS_DIS_SUBCH_BMAP_PRES))
new_chandef.npca_punctured = le16_to_cpu(npca->dis_subch_bmap[0]);
if (!cfg80211_chandef_valid(&new_chandef))
return -EINVAL;
*chandef = new_chandef;
return 0;
}
EXPORT_SYMBOL(cfg80211_chandef_add_npca);
static const struct cfg80211_chan_def *
check_chandef_primary_compat(const struct cfg80211_chan_def *c1,
const struct cfg80211_chan_def *c2,