jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wpa_supplicant: Add EDMG channel configuration parameters

Browse source 
Add two new configuration parameters for wpa_supplicant:
enable_edmg: Enable EDMG capability for STA/AP mode
edmg_channel: Configure channel bonding. In AP mode it defines the EDMG
channel to start the AP on. In STA mode it defines the EDMG channel to
use for connection.

Signed-off-by: Alexei Avshalom Lazar <ailizaro@codeaurora.org>
This commit is contained in:
Alexei Avshalom Lazar 2019-09-11 12:03:07 +03:00 committed by Jouni Malinen
parent 5c5ff22efc
commit e8ff22f471
5 changed files with 32 additions and 0 deletions

2
wpa_supplicant/config.c
View file

@ -2481,6 +2481,8 @@ static const struct parse_data ssid_fields[] = {
{ INT_RANGE(mixed_cell, 0, 1) }, { INT_RANGE(mixed_cell, 0, 1) },
{ INT_RANGE(frequency, 0, 70200) }, { INT_RANGE(frequency, 0, 70200) },
{ INT_RANGE(fixed_freq, 0, 1) }, { INT_RANGE(fixed_freq, 0, 1) },
{ INT_RANGE(enable_edmg, 0, 1) },
{ INT_RANGE(edmg_channel, 9, 13) },
#ifdef CONFIG_ACS #ifdef CONFIG_ACS
{ INT_RANGE(acs, 0, 1) }, { INT_RANGE(acs, 0, 1) },
#endif /* CONFIG_ACS */ #endif /* CONFIG_ACS */

2
wpa_supplicant/config_file.c
View file

@ -847,6 +847,8 @@ static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid)
INT(mode); INT(mode);
INT(no_auto_peer); INT(no_auto_peer);
INT(frequency); INT(frequency);
INT(enable_edmg);
INT(edmg_channel);
INT(fixed_freq); INT(fixed_freq);
#ifdef CONFIG_ACS #ifdef CONFIG_ACS
INT(acs); INT(acs);

17
wpa_supplicant/config_ssid.h
View file

@ -483,6 +483,23 @@ struct wpa_ssid {
*/ */
int frequency; int frequency;
/**
* enable_edmg - Enable EDMG feature in STA/AP mode
*
* This flag is used for enabling the EDMG capability in STA/AP mode.
*/
int enable_edmg;
/**
* edmg_channel - EDMG channel number
*
* This value is used to configure the EDMG channel bonding feature.
* In AP mode it defines the EDMG channel to start the AP on.
* in STA mode it defines the EDMG channel to use for connection
* (if supported by AP).
*/
u8 edmg_channel;
/** /**
* fixed_freq - Use fixed frequency for IBSS * fixed_freq - Use fixed frequency for IBSS
*/ */

1
wpa_supplicant/wpa_cli.c
View file

@ -1441,6 +1441,7 @@ static const char *network_fields[] = {
"dot11MeshHoldingTimeout", "dot11MeshHoldingTimeout",
#endif /* CONFIG_MESH */ #endif /* CONFIG_MESH */
"wpa_ptk_rekey", "bgscan", "ignore_broadcast_ssid", "wpa_ptk_rekey", "bgscan", "ignore_broadcast_ssid",
"enable_edmg", "edmg_channel",
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
"go_p2p_dev_addr", "p2p_client_list", "psk_list", "go_p2p_dev_addr", "p2p_client_list", "psk_list",
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */

10
wpa_supplicant/wpa_supplicant.conf
View file

@ -1548,6 +1548,16 @@ fast_reauth=1
# Set to 1 to disable BSS transition management # Set to 1 to disable BSS transition management
#disable_btm=0 #disable_btm=0
# Enable EDMG capability in STA/AP mode, default value is false
#enable_edmg=1
# This value is used to configure the channel bonding feature.
# Default value is 0.
# Relevant only if enable_edmg is true
# In AP mode it defines the EDMG channel to use for AP operation.
# In STA mode it defines the EDMG channel for connection (if supported by AP).
#edmg_channel=9
# Example blocks: # Example blocks:
# Simple case: WPA-PSK, PSK as an ASCII passphrase, allow all valid ciphers # Simple case: WPA-PSK, PSK as an ASCII passphrase, allow all valid ciphers