-
Notifications
You must be signed in to change notification settings - Fork 138
XF10-34: Add XF10 support #790
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from 6 commits
402f54f
6c91aa2
5252f9f
82bdc0d
2668d67
8f9cffb
d343d3b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -4574,7 +4574,8 @@ void wifidb_init_rfc_config_default(wifi_rfc_dml_parameters_t *config) | |||||
| rfc_config.dfs_rfc = false; | ||||||
| rfc_config.levl_enabled_rfc = false; | ||||||
| rfc_config.memwraptool_app_rfc = true; | ||||||
| #if defined(_XB8_PRODUCT_REQ_) || defined(_SR213_PRODUCT_REQ_) || defined(_XER5_PRODUCT_REQ_) || defined (_SCER11BEL_PRODUCT_REQ_) | ||||||
| #if defined(_XB8_PRODUCT_REQ_) || defined(_SR213_PRODUCT_REQ_) || defined(_XER5_PRODUCT_REQ_) || \ | ||||||
| defined (_SCER11BEL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_) | ||||||
| rfc_config.wpa3_rfc = true; | ||||||
| #else | ||||||
| rfc_config.wpa3_rfc = false; | ||||||
|
|
@@ -4834,7 +4835,7 @@ static void wifidb_vap_config_upgrade(wifi_vap_info_map_t *config, rdk_wifi_vap_ | |||||
| if (g_wifidb->db_version < ONEWIFI_DB_VERSION_HOSTAP_MGMT_FRAME_CTRL_FLAG) { | ||||||
| #if defined(_XB7_PRODUCT_REQ_) || defined(_XB8_PRODUCT_REQ_) || defined(_XB10_PRODUCT_REQ_) || \ | ||||||
| defined(_SCER11BEL_PRODUCT_REQ_) || defined(_CBR2_PRODUCT_REQ_) || \ | ||||||
| defined(_WNXL11BWL_PRODUCT_REQ_) || defined(_SR213_PRODUCT_REQ_) | ||||||
| defined(_SR213_PRODUCT_REQ_) || defined(_WNXL11BWL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_) | ||||||
| if (!isVapSTAMesh(config->vap_array[i].vap_index)) { | ||||||
| config->vap_array[i].u.bss_info.hostap_mgt_frame_ctrl = true; | ||||||
| wifi_util_info_print(WIFI_DB, | ||||||
|
|
@@ -4846,7 +4847,7 @@ static void wifidb_vap_config_upgrade(wifi_vap_info_map_t *config, rdk_wifi_vap_ | |||||
| } | ||||||
| #endif // defined(_XB7_PRODUCT_REQ_) || defined(_XB8_PRODUCT_REQ_) || defined(_XB10_PRODUCT_REQ_) || | ||||||
| // defined(_SCER11BEL_PRODUCT_REQ_) || defined(_CBR2_PRODUCT_REQ_) || | ||||||
| // defined(_WNXL11BWL_PRODUCT_REQ_) || defined(_SR213_PRODUCT_REQ_) | ||||||
| // defined(_SR213_PRODUCT_REQ_) || defined(_WNXL11BWL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_) | ||||||
| } | ||||||
|
|
||||||
| if (g_wifidb->db_version < ONEWIFI_DB_VERSION_STATS_FLAG) { | ||||||
|
|
@@ -7188,7 +7189,8 @@ int wifidb_init_vap_config_default(int vap_index, wifi_vap_info_t *config, | |||||
| cfg.u.bss_info.security.mfp = wifi_mfp_cfg_required; | ||||||
| cfg.u.bss_info.security.u.key.type = wifi_security_key_type_sae; | ||||||
| } else { | ||||||
| #if defined(_XB8_PRODUCT_REQ_) || defined(_SR213_PRODUCT_REQ_) || defined(_XER5_PRODUCT_REQ_) || defined(_SCER11BEL_PRODUCT_REQ_) | ||||||
| #if defined(_XB8_PRODUCT_REQ_) || defined(_SR213_PRODUCT_REQ_) || defined(_XER5_PRODUCT_REQ_) || \ | ||||||
| defined(_SCER11BEL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_) | ||||||
| cfg.u.bss_info.security.mode = wifi_security_mode_wpa3_transition; | ||||||
| cfg.u.bss_info.security.wpa3_transition_disable = false; | ||||||
| cfg.u.bss_info.security.mfp = wifi_mfp_cfg_optional; | ||||||
|
|
@@ -7247,7 +7249,7 @@ int wifidb_init_vap_config_default(int vap_index, wifi_vap_info_t *config, | |||||
| cfg.u.bss_info.showSsid = false; | ||||||
| } | ||||||
|
|
||||||
| #if defined(_XER5_PRODUCT_REQ_) || defined(_XB10_PRODUCT_REQ_) || defined(_SCER11BEL_PRODUCT_REQ_) | ||||||
| #if defined(_XER5_PRODUCT_REQ_) || defined(_XB10_PRODUCT_REQ_) || defined(_SCER11BEL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_) | ||||||
| if (isVapLnfSecure(vap_index) || isVapPrivate(vap_index)) { | ||||||
| cfg.u.bss_info.enabled = true; | ||||||
| } | ||||||
|
|
@@ -7257,15 +7259,15 @@ int wifidb_init_vap_config_default(int vap_index, wifi_vap_info_t *config, | |||||
| } | ||||||
| #endif | ||||||
| #if defined(_SKY_HUB_COMMON_PRODUCT_REQ_) | ||||||
| #ifndef _SCER11BEL_PRODUCT_REQ_ | ||||||
| #if !defined(_SCER11BEL_PRODUCT_REQ_) && !defined(_SCXF11BFL_PRODUCT_REQ_) | ||||||
| if (isVapXhs(vap_index)) { | ||||||
| cfg.u.bss_info.enabled = false; | ||||||
| } | ||||||
| #endif | ||||||
| if (isVapLnfPsk(vap_index)) { | ||||||
| cfg.u.bss_info.enabled = false; | ||||||
| } | ||||||
| #if defined(_SR213_PRODUCT_REQ_) || defined(_SCER11BEL_PRODUCT_REQ_) | ||||||
| #if defined(_SR213_PRODUCT_REQ_) || defined(_SCER11BEL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_) | ||||||
| cfg.u.bss_info.bssMaxSta = wifi_hal_cap_obj->wifi_prop.BssMaxStaAllow; | ||||||
| #else | ||||||
| cfg.u.bss_info.bssMaxSta = BSS_MAX_NUM_STA_SKY; | ||||||
|
|
@@ -7287,15 +7289,16 @@ int wifidb_init_vap_config_default(int vap_index, wifi_vap_info_t *config, | |||||
|
|
||||||
| #if defined(_XB7_PRODUCT_REQ_) || defined(_XB8_PRODUCT_REQ_) || defined(_XB10_PRODUCT_REQ_) || \ | ||||||
| defined(_SCER11BEL_PRODUCT_REQ_) || defined(_CBR2_PRODUCT_REQ_) || \ | ||||||
| defined(_WNXL11BWL_PRODUCT_REQ_) || defined(_SR213_PRODUCT_REQ_) | ||||||
| defined(_SR213_PRODUCT_REQ_) || defined(_WNXL11BWL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_) | ||||||
| if (!isVapSTAMesh(vap_index)) { | ||||||
| cfg.u.bss_info.hostap_mgt_frame_ctrl = true; | ||||||
| wifi_util_info_print(WIFI_DB, "%s:%d vap_index:%d hostap_mgt_frame_ctrl:%d\n", __func__, | ||||||
| __LINE__, vap_index, cfg.u.bss_info.hostap_mgt_frame_ctrl); | ||||||
| } | ||||||
| #endif // defined(_XB7_PRODUCT_REQ_) || defined(_XB8_PRODUCT_REQ_) || defined(_XB10_PRODUCT_REQ_) || | ||||||
| // defined(_SCER11BEL_PRODUCT_REQ_) || defined(_CBR2_PRODUCT_REQ_) || | ||||||
| // defined(_WNXL11BWL_PRODUCT_REQ_) || defined(_SR213_PRODUCT_REQ_) | ||||||
| // defined(_SR213_PRODUCT_REQ_) || \ defined(_WNXL11BWL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_) | ||||||
|
||||||
| // defined(_SR213_PRODUCT_REQ_) || \ defined(_WNXL11BWL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_) | |
| // defined(_SR213_PRODUCT_REQ_) || defined(_WNXL11BWL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_) |
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -67,7 +67,9 @@ struct ovs_vapname_cloudvifname_map { | |||||
| char vapname[64]; | ||||||
| }; | ||||||
|
|
||||||
| #if defined (_PP203X_PRODUCT_REQ_) || defined (_XER5_PRODUCT_REQ_) || defined (_XB10_PRODUCT_REQ_) || defined (_SCER11BEL_PRODUCT_REQ_) || defined (_GREXT02ACTS_PRODUCT_REQ_) || defined (_GREXT02ACTS_PRODUCT_REQ_) | ||||||
| #if defined (_PP203X_PRODUCT_REQ_) || defined (_XER5_PRODUCT_REQ_) || defined (_XB10_PRODUCT_REQ_) || \ | ||||||
| defined (_SCER11BEL_PRODUCT_REQ_) || defined (_GREXT02ACTS_PRODUCT_REQ_) || defined (_GREXT02ACTS_PRODUCT_REQ_) || \ | ||||||
|
||||||
| defined (_SCER11BEL_PRODUCT_REQ_) || defined (_GREXT02ACTS_PRODUCT_REQ_) || defined (_GREXT02ACTS_PRODUCT_REQ_) || \ | |
| defined (_SCER11BEL_PRODUCT_REQ_) || defined (_GREXT02ACTS_PRODUCT_REQ_) || \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is trailing whitespace at the end of this line. Remove the trailing space for consistency with coding standards.