patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

net: mgmt: Provide Regulatory channel info

Browse source 
Updated to provide regulatory channel information along with country
code.

Signed-off-by: Ajay Parida <ajay.parida@nordicsemi.no>
This commit is contained in:
Ajay Parida 2024-01-08 16:57:32 +05:30 committed by Carles Cufí
parent 0a26da9b08
commit 56de0a347e
2 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/zephyr/net/wifi_mgmt.h
View file

@ -548,6 +548,22 @@ enum wifi_mgmt_op {
WIFI_MGMT_SET = 1,
};
#define MAX_REG_CHAN_NUM 42
/** Per-channel regulatory attributes */
struct wifi_reg_chan_info {
/** Center frequency in MHz */
unsigned short center_frequency;
/** Maximum transmission power (in dBm) */
unsigned short max_power:8;
/** Is channel supported or not */
unsigned short supported:1;
/** Passive transmissions only */
unsigned short passive_only:1;
/** Is a DFS channel */
unsigned short dfs:1;
} __packed;
/** Regulatory domain information or configuration */
struct wifi_reg_domain {
/* Regulatory domain operation */
@ -556,6 +572,10 @@ struct wifi_reg_domain {
bool force;
/** Country code: ISO/IEC 3166-1 alpha-2 */
uint8_t country_code[WIFI_COUNTRY_CODE_LEN];
/** Number of channels supported */
unsigned int num_channels;
/** Channels information */
struct wifi_reg_chan_info *chan_info;
};
/** Wi-Fi TWT sleep states */

19
subsys/net/l2/wifi/wifi_shell.c
View file

@ -65,6 +65,7 @@ static struct {
static uint32_t scan_result;
static struct net_mgmt_event_callback wifi_shell_mgmt_cb;
static struct wifi_reg_chan_info chan_info[MAX_REG_CHAN_NUM];
static K_MUTEX_DEFINE(wifi_ap_sta_list_lock);
struct wifi_ap_sta_node {
@ -135,7 +136,6 @@ static void handle_wifi_scan_result(struct net_mgmt_event_callback *cb)
wifi_mfp_txt(entry->mfp));
}
#ifdef CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS
static int wifi_freq_to_channel(int frequency)
{
int channel = 0;
@ -157,6 +157,7 @@ static int wifi_freq_to_channel(int frequency)
return channel;
}
#ifdef CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS
static enum wifi_frequency_bands wifi_freq_to_band(int frequency)
{
enum wifi_frequency_bands band = WIFI_FREQ_BAND_2_4_GHZ;
@ -1295,9 +1296,10 @@ static int cmd_wifi_reg_domain(const struct shell *sh, size_t argc,
{
struct net_if *iface = net_if_get_first_wifi();
struct wifi_reg_domain regd = {0};
int ret;
int ret, chan_idx = 0;
if (argc == 1) {
(&regd)->chan_info = &chan_info[0];
regd.oper = WIFI_MGMT_GET;
} else if (argc >= 2 && argc <= 3) {
regd.oper = WIFI_MGMT_SET;
@ -1342,6 +1344,19 @@ static int cmd_wifi_reg_domain(const struct shell *sh, size_t argc,
if (regd.oper == WIFI_MGMT_GET) {
shell_fprintf(sh, SHELL_NORMAL, "Wi-Fi Regulatory domain is: %c%c\n",
regd.country_code[0], regd.country_code[1]);
shell_fprintf(sh, SHELL_NORMAL,
"<channel>\t<center frequency>\t<supported(y/n)>\t"
"<max power(dBm)>\t<passive scan supported(y/n)>\t<dfs supported(y/n)>\n");
for (chan_idx = 0; chan_idx < regd.num_channels; chan_idx++) {
shell_fprintf(sh, SHELL_NORMAL,
" %d\t\t\t\%d\t\t\t\%s\t\t\t%d\t\t\t%s\t\t\t\t%s\n",
wifi_freq_to_channel(chan_info[chan_idx].center_frequency),
chan_info[chan_idx].center_frequency,
chan_info[chan_idx].supported ? "y" : "n",
chan_info[chan_idx].max_power,
chan_info[chan_idx].passive_only ? "y" : "n",
chan_info[chan_idx].dfs ? "y" : "n");
}
} else {
shell_fprintf(sh, SHELL_NORMAL, "Wi-Fi Regulatory domain set to: %c%c\n",
regd.country_code[0], regd.country_code[1]);