From 9a83899eeef2bb2bcc843d69ad846aeb7600bdef Mon Sep 17 00:00:00 2001 From: DanielEdriPurpl Date: Sat, 15 Aug 2020 14:30:04 +0000 Subject: [PATCH 1/2] common: tlvf: remove the unsupported option of 60Ghz The 60Ghz band is currently not supported, and shouldn't be part of the available configuration of the selected bands. Remove the 60Ghz from the eSelectedBands enum which is used by the persistent DB. PPM-383 Signed-off-by: DanielEdriPurpl --- .../include/beerocks/tlvf/beerocks_message_common.h | 1 - .../tlvf/yaml/beerocks/tlvf/beerocks_message_common.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/common/beerocks/tlvf/AutoGenerated/include/beerocks/tlvf/beerocks_message_common.h b/common/beerocks/tlvf/AutoGenerated/include/beerocks/tlvf/beerocks_message_common.h index 2160ef81af..d2aa7b0ea0 100644 --- a/common/beerocks/tlvf/AutoGenerated/include/beerocks/tlvf/beerocks_message_common.h +++ b/common/beerocks/tlvf/AutoGenerated/include/beerocks/tlvf/beerocks_message_common.h @@ -1358,7 +1358,6 @@ enum eClientSelectedBands: uint8_t { eSelectedBands_24G = 0x1, eSelectedBands_5G = 0x2, eSelectedBands_6G = 0x4, - eSelectedBands_60G = 0x8, }; typedef struct sClientConfig { diff --git a/common/beerocks/tlvf/yaml/beerocks/tlvf/beerocks_message_common.yaml b/common/beerocks/tlvf/yaml/beerocks/tlvf/beerocks_message_common.yaml index 271d506d3b..219a38ea31 100755 --- a/common/beerocks/tlvf/yaml/beerocks/tlvf/beerocks_message_common.yaml +++ b/common/beerocks/tlvf/yaml/beerocks/tlvf/beerocks_message_common.yaml @@ -984,7 +984,6 @@ eClientSelectedBands: eSelectedBands_24G: 1 eSelectedBands_5G: 2 eSelectedBands_6G: 4 - eSelectedBands_60G: 8 sClientConfig: _type: struct From 4a8396c0af9de09105918f9c0b82ee4e1c65a249 Mon Sep 17 00:00:00 2001 From: DanielEdriPurpl Date: Sat, 15 Aug 2020 14:31:28 +0000 Subject: [PATCH 2/2] bml: remove the unsupported 60Ghz option from selected bands Remove the 60Ghz option from the BML_CLIENT_SELECTED_BANDS in both bml_defs and bml_cli respectively. PPM-383 Signed-off-by: DanielEdriPurpl --- controller/src/beerocks/bml/bml_defs.h | 1 - controller/src/beerocks/cli/beerocks_cli_bml.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/controller/src/beerocks/bml/bml_defs.h b/controller/src/beerocks/bml/bml_defs.h index 3d9ec8b0cc..e8625d2151 100644 --- a/controller/src/beerocks/bml/bml_defs.h +++ b/controller/src/beerocks/bml/bml_defs.h @@ -126,7 +126,6 @@ extern "C" { #define BML_CLIENT_SELECTED_BANDS_24G 1 #define BML_CLIENT_SELECTED_BANDS_5G 2 #define BML_CLIENT_SELECTED_BANDS_6G 4 -#define BML_CLIENT_SELECTED_BANDS_60G 8 #define BML_PARAMETER_NOT_CONFIGURED -1 diff --git a/controller/src/beerocks/cli/beerocks_cli_bml.cpp b/controller/src/beerocks/cli/beerocks_cli_bml.cpp index 8b9f517676..4e80720cd0 100644 --- a/controller/src/beerocks/cli/beerocks_cli_bml.cpp +++ b/controller/src/beerocks/cli/beerocks_cli_bml.cpp @@ -2264,8 +2264,6 @@ int cli_bml::client_get_client(const std::string &sta_mac) ret += "5GHz,"; if (val & BML_CLIENT_SELECTED_BANDS_6G) ret += "6GHz,"; - if (val & BML_CLIENT_SELECTED_BANDS_60G) - ret += "60GHz,"; // remove ending comma if (!ret.empty() && (ret.back() == ',')) {