Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00
Code Releases Activity

wiphy: add disabled_freqs list

Browse Source 
If a frequency is disabled IWD should keep track and disallow any
operations on that channel such as scanning. A new list has been added
which contains only disabled frequencies.
This commit is contained in:
James Prestwood 2022-07-26 10:09:18 -07:00 committed by Denis Kenzior
parent 081b0af2d6
commit 98620ecd11
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/wiphy.c
View File

@ -104,6 +104,7 @@ struct wiphy {
uint16_t supported_iftypes; uint16_t supported_iftypes;
uint16_t supported_ciphers; uint16_t supported_ciphers;
struct scan_freq_set *supported_freqs; struct scan_freq_set *supported_freqs;
struct scan_freq_set *disabled_freqs;
struct band *band_2g; struct band *band_2g;
struct band *band_5g; struct band *band_5g;
struct band *band_6g; struct band *band_6g;
@ -316,6 +317,7 @@ static struct wiphy *wiphy_new(uint32_t id)
wiphy->id = id; wiphy->id = id;
wiphy->supported_freqs = scan_freq_set_new(); wiphy->supported_freqs = scan_freq_set_new();
wiphy->disabled_freqs = scan_freq_set_new();
watchlist_init(&wiphy->state_watches, NULL); watchlist_init(&wiphy->state_watches, NULL);
wiphy->extended_capabilities[0] = IE_TYPE_EXTENDED_CAPABILITIES; wiphy->extended_capabilities[0] = IE_TYPE_EXTENDED_CAPABILITIES;
wiphy->extended_capabilities[1] = EXT_CAP_LEN; wiphy->extended_capabilities[1] = EXT_CAP_LEN;
@ -357,6 +359,7 @@ static void wiphy_free(void *data)
} }
scan_freq_set_free(wiphy->supported_freqs); scan_freq_set_free(wiphy->supported_freqs);
scan_freq_set_free(wiphy->disabled_freqs);
watchlist_destroy(&wiphy->state_watches); watchlist_destroy(&wiphy->state_watches);
l_free(wiphy->model_str); l_free(wiphy->model_str);
l_free(wiphy->vendor_str); l_free(wiphy->vendor_str);
@ -454,6 +457,11 @@ const struct scan_freq_set *wiphy_get_supported_freqs(
return wiphy->supported_freqs; return wiphy->supported_freqs;
} }
const struct scan_freq_set *wiphy_get_disabled_freqs(const struct wiphy *wiphy)
{
return wiphy->disabled_freqs;
}
bool wiphy_can_transition_disable(struct wiphy *wiphy) bool wiphy_can_transition_disable(struct wiphy *wiphy)
{ {
/* /*
@ -1208,19 +1216,31 @@ static void parse_supported_frequencies(struct wiphy *wiphy,
struct l_genl_attr attr; struct l_genl_attr attr;
while (l_genl_attr_next(freqs, NULL, NULL, NULL)) { while (l_genl_attr_next(freqs, NULL, NULL, NULL)) {
uint32_t freq = 0;
bool disabled = false;
if (!l_genl_attr_recurse(freqs, &attr)) if (!l_genl_attr_recurse(freqs, &attr))
continue; continue;
while (l_genl_attr_next(&attr, &type, &len, &data)) { while (l_genl_attr_next(&attr, &type, &len, &data)) {
uint32_t u32;
switch (type) { switch (type) {
case NL80211_FREQUENCY_ATTR_FREQ: case NL80211_FREQUENCY_ATTR_FREQ:
u32 = *((uint32_t *) data); freq = *((uint32_t *) data);
scan_freq_set_add(wiphy->supported_freqs, u32); break;
case NL80211_FREQUENCY_ATTR_DISABLED:
disabled = true;
break; break;
} }
} }
if (!freq)
continue;
scan_freq_set_add(wiphy->supported_freqs, freq);
if (disabled)
scan_freq_set_add(wiphy->disabled_freqs, freq);
} }
} }

1
src/wiphy.h
View File

@ -93,6 +93,7 @@ const char *wiphy_get_path(struct wiphy *wiphy);
uint32_t wiphy_get_supported_bands(struct wiphy *wiphy); uint32_t wiphy_get_supported_bands(struct wiphy *wiphy);
const struct scan_freq_set *wiphy_get_supported_freqs( const struct scan_freq_set *wiphy_get_supported_freqs(
const struct wiphy *wiphy); const struct wiphy *wiphy);
const struct scan_freq_set *wiphy_get_disabled_freqs(const struct wiphy *wiphy);
bool wiphy_can_transition_disable(struct wiphy *wiphy); bool wiphy_can_transition_disable(struct wiphy *wiphy);
bool wiphy_can_offload(struct wiphy *wiphy); bool wiphy_can_offload(struct wiphy *wiphy);
bool wiphy_supports_cmds_auth_assoc(struct wiphy *wiphy); bool wiphy_supports_cmds_auth_assoc(struct wiphy *wiphy);