From 402f54fbccc9d4665a3d9373d86a4d463baa6765 Mon Sep 17 00:00:00 2001 From: Jonathan Wu Date: Wed, 6 Aug 2025 17:41:18 +0000 Subject: [PATCH 1/4] XF10-34 : Add XF10 support Reason for change: Add XF10 changes. Test Procedure: None Risks: None Priority: P0 Signed-off-by: Jonathan Wu --- scripts/OneWiFi_Selfheal.sh | 8 ++++---- scripts/mesh_setip.sh | 12 ++++++------ source/core/wifi_ctrl.c | 2 +- source/db/wifi_db.c | 6 ++++-- source/db/wifi_db_apis.c | 23 +++++++++++++---------- source/dml/tr_181/ml/cosa_wifi_dml.c | 3 ++- source/utils/wifi_util.c | 2 +- source/webconfig/wifi_ovsdb_translator.c | 8 +++++--- 8 files changed, 36 insertions(+), 28 deletions(-) diff --git a/scripts/OneWiFi_Selfheal.sh b/scripts/OneWiFi_Selfheal.sh index facedf6a1..ee39db0ea 100644 --- a/scripts/OneWiFi_Selfheal.sh +++ b/scripts/OneWiFi_Selfheal.sh @@ -325,9 +325,9 @@ do if [ "$MODEL_NUM" == "SR213" ]; then eco_mode_2g=`dmcli eRT getv Device.WiFi.Radio.$radio_2g_instance.X_RDK_EcoPowerDown | grep "value:" | cut -f2- -d:| cut -f2- -d:` eco_mode_5g=`dmcli eRT getv Device.WiFi.Radio.$radio_5g_instance.X_RDK_EcoPowerDown | grep "value:" | cut -f2- -d:| cut -f2- -d:` - eco_mode_6g="false" - elif [ "$MODEL_NUM" == "SCER11BEL" ]; then - eco_mode_2g=`dmcli eRT getv Device.WiFi.Radio.$radio_2g_instance.X_RDK_EcoPowerDown | grep "value:" | cut -f2- -d:| cut -f2- -d:` + eco_mode_6g="false" + elif [ "$MODEL_NUM" == "SCER11BEL" ] || [ "$MODEL_NUM" == "SCXF11BFL" ]; then + eco_mode_2g=`dmcli eRT getv Device.WiFi.Radio.$radio_2g_instance.X_RDK_EcoPowerDown | grep "value:" | cut -f2- -d:| cut -f2- -d:` eco_mode_5g=`dmcli eRT getv Device.WiFi.Radio.$radio_5g_instance.X_RDK_EcoPowerDown | grep "value:" | cut -f2- -d:| cut -f2- -d:` eco_mode_6g=`dmcli eRT getv Device.WiFi.Radio.$radio_6g_instance.X_RDK_EcoPowerDown | grep "value:" | cut -f2- -d:| cut -f2- -d:` else @@ -400,7 +400,7 @@ do fi fi - if [ "$MODEL_NUM" == "$CGM49" ] || [ "${MODEL_NUM}" = "CGM601TCOM" ] || [ "${MODEL_NUM}" = "CWA438TCOM" ] || [ "${MODEL_NUM}" = "SG417DBCT" ] || [ "${MODEL_NUM}" == "SCER11BEL" ]; then + if [ "$MODEL_NUM" == "CGM4981COM" ] || [ "${MODEL_NUM}" = "CGM601TCOM" ] || [ "${MODEL_NUM}" = "SG417DBCT" ] || [ "${MODEL_NUM}" == "SCER11BEL" ] || [ "$MODEL_NUM" == "SCXF11BFL" ]; then if [ $eco_mode_6g == "false" ]; then radio_status_6g=`dmcli eRT getv Device.WiFi.Radio.$radio_6g_instance.Enable | grep "value:" | cut -f2- -d:| cut -f2- -d:` if [ $radio_status_6g == "true" ]; then diff --git a/scripts/mesh_setip.sh b/scripts/mesh_setip.sh index ac5783575..172dff525 100755 --- a/scripts/mesh_setip.sh +++ b/scripts/mesh_setip.sh @@ -69,13 +69,13 @@ secBhaulEnable=`syscfg get SecureBackhaul_Enable` wifiDynamicProfile=`sysevent get wifiDynamicProfile` # 0 - LnF, 1 - mesh onboarding if [ "x$ovs_enable" = "xtrue" ] || [ "x$bridgeUtilEnable" = "xtrue" ] ; then - if [ "$MODEL_NUM" == "$CGM43" ] || [ "$MODEL_NUM" == "$CGM49" ] || [ "$MODEL_NUM" == "CGM601TCOM" ] || [ "$MODEL_NUM" == "CWA438TCOM" ] || [ "$MODEL_NUM" == "SG417DBCT" ] || [ "$MODEL_NUM" == "SCER11BEL" ] || [ "$MODEL_NUM" == "VTER11QEL" ] || [ "$MODEL_NUM" == "SR300" ] || [ "$MODEL_NUM" == "SE501" ] || [ "$MODEL_NUM" == "$WNX" ] || [ "$MODEL_NUM" == "$TG4" ] || [ "$MODEL_NUM" == "SR213" ] || [ "$MODEL_NUM" == "$CGA4" ]; then + if [ "$MODEL_NUM" == "$CGM43" ] || [ "$MODEL_NUM" == "$CGM49" ] || [ "$MODEL_NUM" == "CGM601TCOM" ] || [ "$MODEL_NUM" == "CWA438TCOM" ] || [ "$MODEL_NUM" == "SG417DBCT" ] || [ "$MODEL_NUM" == "SCER11BEL" ] || [ "$MODEL_NUM" == "SCXF11BFL" ] || [ "$MODEL_NUM" == "VTER11QEL" ] || [ "$MODEL_NUM" == "SR300" ] || [ "$MODEL_NUM" == "SE501" ] || [ "$MODEL_NUM" == "$WNX" ] || [ "$MODEL_NUM" == "$TG4" ] || [ "$MODEL_NUM" == "SR213" ] || [ "$MODEL_NUM" == "$CGA4" ]; then USE_BRIDGEUTILS=1 fi fi #XF3 & CommScope XB7 XLE specific changes -if [ "$MODEL_NUM" == "$X50" ] || [ "$MODEL_NUM" == "$CGM43" ] || [ "$MODEL_NUM" == "$CGM49" ] || [ "$MODEL_NUM" == "CGM601TCOM" ] || [ "$MODEL_NUM" == "CWA438TCOM" ] || [ "$MODEL_NUM" == "SG417DBCT" ] || [ "$MODEL_NUM" == "SCER11BEL" ] || [ "$MODEL_NUM" == "VTER11QEL" ] || [ "$MODEL_NUM" == "$TG4" ] || [ "$MODEL_NUM" == "$WNX" ] || [ "$MODEL_NUM" == "$CGA4" ]; then +if [ "$MODEL_NUM" == "$X50" ] || [ "$MODEL_NUM" == "$CGM43" ] || [ "$MODEL_NUM" == "$CGM49" ] || [ "$MODEL_NUM" == "CGM601TCOM" ] || [ "$MODEL_NUM" == "CWA438TCOM" ] || [ "$MODEL_NUM" == "SG417DBCT" ] || [ "$MODEL_NUM" == "SCER11BEL" ] || [ "$MODEL_NUM" == "SCXF11BFL" ] || [ "$MODEL_NUM" == "VTER11QEL" ] || [ "$MODEL_NUM" == "$TG4" ] || [ "$MODEL_NUM" == "$WNX" ] || [ "$MODEL_NUM" == "$CGA4" ]; then IF_MESHBR24="brlan112" IF_MESHBR50="brlan113" IF_MESHBRONBOARD="brlan115" @@ -239,7 +239,7 @@ if [ "$1" == "set_eb" ];then exit 0 fi -if [ "$MODEL_NUM" == "SR201" ] || [ "$MODEL_NUM" == "SR203" ] || [ "$MODEL_NUM" == "SR300" ] || [ "$MODEL_NUM" == "SE501" ] || [ "$MODEL_NUM" == "VTER11QEL" ] || [ "$MODEL_NUM" == "SCER11BEL" ] || [ "$MODEL_NUM" == "$TG4" ]; then +if [ "$MODEL_NUM" == "SR201" ] || [ "$MODEL_NUM" == "SR203" ] || [ "$MODEL_NUM" == "SR300" ] || [ "$MODEL_NUM" == "SE501" ] || [ "$MODEL_NUM" == "VTER11QEL" ] || [ "$MODEL_NUM" == "SCER11BEL" ] || [ "$MODEL_NUM" == "SCXF11BFL" ] || [ "$MODEL_NUM" == "$TG4" ]; then if [ $USE_BRIDGEUTILS -eq 1 ]; then if [ "$MODEL_NUM" == "$WNX" ]; then if [ "`psmcli get dmsb.l3net.10.V4Addr`" != "$MESHBR24_DEFAULT_IP" ]; then @@ -260,7 +260,7 @@ if [ -n "${IF_MESHBR24}" ] && [ $USE_BRIDGEUTILS -eq 0 ]; then echo "Configuring $IF_MESHBR24" bridge_set_mtu $IF_MESHBR24 $BRIDGE_MTU ifconfig $IF_MESHBR24 $MESHBR24_IP - if [ "$MODEL_NUM" == "$X50" ] || [ "$MODEL_NUM" == "$CGM43" ] || [ "$MODEL_NUM" == "$CGM49" ] || [ "$MODEL_NUM" == "CGM601TCOM" ] || [ "$MODEL_NUM" == "CWA438TCOM" ] || [ "$MODEL_NUM" == "SG417DBCT" ] || [ "$MODEL_NUM" == "SCER11BEL" ] || [ "$MODEL_NUM" == "VTER11QEL" ] || [ "$MODEL_NUM" == "SR201" ] || [ "$MODEL_NUM" == "SR203" ] || [ "$MODEL_NUM" == "SR300" ] || [ "$MODEL_NUM" == "SE501" ] || [ "$MODEL_NUM" == "$WNX" ] || [ "$MODEL_NUM" == "SR213" ] || [ "$MODEL_NUM" == "$CGA4" ]; then + if [ "$MODEL_NUM" == "$X50" ] || [ "$MODEL_NUM" == "$CGM43" ] || [ "$MODEL_NUM" == "$CGM49" ] || [ "$MODEL_NUM" == "CGM601TCOM" ] || [ "$MODEL_NUM" == "CWA438TCOM" ] || [ "$MODEL_NUM" == "SG417DBCT" ] || [ "$MODEL_NUM" == "SCER11BEL" ] || [ "$MODEL_NUM" == "SCXF11BFL" ] || [ "$MODEL_NUM" == "VTER11QEL" ] || [ "$MODEL_NUM" == "SR201" ] || [ "$MODEL_NUM" == "SR203" ] || [ "$MODEL_NUM" == "SR300" ] || [ "$MODEL_NUM" == "SE501" ] || [ "$MODEL_NUM" == "$WNX" ] || [ "$MODEL_NUM" == "SR213" ] || [ "$MODEL_NUM" == "$CGA4" ]; then ifconfig $IF_MESHBR24 mtu $BRIDGE_MTU ifconfig $IF_MESHVAP24 mtu $BRIDGE_MTU fi @@ -270,7 +270,7 @@ if [ -n "${IF_MESHBR50}" ] && [ $USE_BRIDGEUTILS -eq 0 ]; then echo "Configuring $IF_MESHBR50" bridge_set_mtu $IF_MESHBR50 $BRIDGE_MTU ifconfig $IF_MESHBR50 $MESHBR50_IP - if [ "$MODEL_NUM" == "$X50" ] || [ "$MODEL_NUM" == "$CGM43" ] || [ "$MODEL_NUM" == "$CGM49" ] || [ "$MODEL_NUM" == "CGM601TCOM" ] || [ "$MODEL_NUM" == "CWA438TCOM" ] || [ "$MODEL_NUM" == "SG417DBCT" ] || [ "$MODEL_NUM" == "SCER11BEL" ] || [ "$MODEL_NUM" == "VTER11QEL" ] || [ "$MODEL_NUM" == "SR201" ] || [ "$MODEL_NUM" == "SR203" ] || [ "$MODEL_NUM" == "SR300" ] || [ "$MODEL_NUM" == "SE501" ] || [ "$MODEL_NUM" == "$WNX" ] || [ "$MODEL_NUM" == "SR213" ] || [ "$MODEL_NUM" == "$CGA4" ]; then + if [ "$MODEL_NUM" == "$X50" ] || [ "$MODEL_NUM" == "$CGM43" ] || [ "$MODEL_NUM" == "$CGM49" ] || [ "$MODEL_NUM" == "CGM601TCOM" ] || [ "$MODEL_NUM" == "CWA438TCOM" ] || [ "$MODEL_NUM" == "SG417DBCT" ] || [ "$MODEL_NUM" == "SCER11BEL" ] || [ "$MODEL_NUM" == "SCXF11BFL" ] || [ "$MODEL_NUM" == "VTER11QEL" ] || [ "$MODEL_NUM" == "SR201" ] || [ "$MODEL_NUM" == "SR203" ] || [ "$MODEL_NUM" == "SR300" ] || [ "$MODEL_NUM" == "SE501" ] || [ "$MODEL_NUM" == "$WNX" ] || [ "$MODEL_NUM" == "SR213" ] || [ "$MODEL_NUM" == "$CGA4" ]; then ifconfig $IF_MESHBR50 mtu $BRIDGE_MTU ifconfig $IF_MESHVAP50 mtu $BRIDGE_MTU fi @@ -284,7 +284,7 @@ if [ "$MODEL_NUM" == "VTER11QEL" ]; then ifconfig $wifi7_MESHVAP50 mtu $BRIDGE_MTU fi -if [ "$MODEL_NUM" == "$X50" ] || [ "$MODEL_NUM" == "$CGM43" ] || [ "$MODEL_NUM" == "$CGM49" ] || [ "$MODEL_NUM" == "CGM601TCOM" ] || [ "$MODEL_NUM" == "CWA438TCOM" ] || [ "$MODEL_NUM" == "SG417DBCT" ] || [ "$MODEL_NUM" == "SCER11BEL" ] || [ "$MODEL_NUM" == "VTER11QEL" ] || [ "$MODEL_NUM" == "SR201" ] || [ "$MODEL_NUM" == "SR203" ] || [ "$MODEL_NUM" == "SR300" ] || [ "$MODEL_NUM" == "SE501" ] || [ "$MODEL_NUM" == "$TG4" ] || [ "$MODEL_NUM" == "$WNX" ] || [ "$MODEL_NUM" == "SR213" ] || [ "$MODEL_NUM" == "$CGA4" ]; then +if [ "$MODEL_NUM" == "$X50" ] || [ "$MODEL_NUM" == "$CGM43" ] || [ "$MODEL_NUM" == "$CGM49" ] || [ "$MODEL_NUM" == "CGM601TCOM" ] || [ "$MODEL_NUM" == "CWA438TCOM" ] || [ "$MODEL_NUM" == "SG417DBCT" ] || [ "$MODEL_NUM" == "SCER11BEL" ] || [ "$MODEL_NUM" == "SCXF11BFL" ] || [ "$MODEL_NUM" == "VTER11QEL" ] || [ "$MODEL_NUM" == "SR201" ] || [ "$MODEL_NUM" == "SR203" ] || [ "$MODEL_NUM" == "SR300" ] || [ "$MODEL_NUM" == "SE501" ] || [ "$MODEL_NUM" == "$TG4" ] || [ "$MODEL_NUM" == "$WNX" ] || [ "$MODEL_NUM" == "SR213" ] || [ "$MODEL_NUM" == "$CGA4" ]; then brctl112=`brctl show | grep "$IF_MESHVAP24"` brctl113=`brctl show | grep "$IF_MESHVAP50"` if [ "$brctl113" == "" ] || [ "$brctl112" == "" ] && [ "$MODEL_NUM" == "$X50" ]; then diff --git a/source/core/wifi_ctrl.c b/source/core/wifi_ctrl.c index 09b4a0635..87782b314 100644 --- a/source/core/wifi_ctrl.c +++ b/source/core/wifi_ctrl.c @@ -838,7 +838,7 @@ int start_wifi_services(void) start_gateway_vaps(); captive_portal_check(); #if !defined(NEWPLATFORM_PORT) && !defined(_SR213_PRODUCT_REQ_) && \ - (defined(_XB10_PRODUCT_REQ_) || defined(_SCER11BEL_PRODUCT_REQ_)) + (defined(_XB10_PRODUCT_REQ_) || defined(_SCER11BEL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_)) /* Function to check for default SSID and Passphrase for Private VAPS if they are default and last-reboot reason is SW get the previous config from Webconfig */ validate_and_sync_private_vap_credentials(); diff --git a/source/db/wifi_db.c b/source/db/wifi_db.c index 13f06afab..befd6487a 100644 --- a/source/db/wifi_db.c +++ b/source/db/wifi_db.c @@ -494,8 +494,10 @@ static int init_vap_config_default(int vap_index, wifi_vap_info_t *config, cfg.u.bss_info.showSsid = false; } /*For XER5/XB10/XER10 2.4G XHS is disable by default*/ -#if defined(_XER5_PRODUCT_REQ_) || defined(_XB10_PRODUCT_REQ_) || defined(_SCER11BEL_PRODUCT_REQ_) - if (isVapLnfSecure(vap_index) || isVapPrivate(vap_index)) { +#if defined(_XER5_PRODUCT_REQ_) || defined(_XB10_PRODUCT_REQ_) || defined(_SCER11BEL_PRODUCT_REQ_) || \ + defined(_SCXF11BFL_PRODUCT_REQ_) + if (isVapLnf(vap_index) || isVapPrivate(vap_index) || + isVapMeshBackhaul(vap_index) || isVapXhs(vap_index)) { cfg.u.bss_info.enabled = true; } #else diff --git a/source/db/wifi_db_apis.c b/source/db/wifi_db_apis.c index 3023859fb..3ca967805 100644 --- a/source/db/wifi_db_apis.c +++ b/source/db/wifi_db_apis.c @@ -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,8 +7249,8 @@ 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 (isVapLnfSecure(vap_index) || isVapPrivate(vap_index)) { +#if defined(_XER5_PRODUCT_REQ_) || defined(_XB10_PRODUCT_REQ_) || defined(_SCER11BEL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_) + if (isVapLnf(vap_index) || isVapPrivate(vap_index)) { cfg.u.bss_info.enabled = true; } #else @@ -7257,7 +7259,7 @@ 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; } @@ -7265,7 +7267,7 @@ int wifidb_init_vap_config_default(int vap_index, wifi_vap_info_t *config, 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,7 +7289,7 @@ 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__, @@ -7295,7 +7297,8 @@ int wifidb_init_vap_config_default(int vap_index, wifi_vap_info_t *config, } #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_) + cfg.u.bss_info.interop_ctrl = false; cfg.u.bss_info.inum_sta = 0; wifi_util_dbg_print(WIFI_DB, "%s:%d vap_index:%d interop_ctrl:%d inum_sta:%d \n", __func__, diff --git a/source/dml/tr_181/ml/cosa_wifi_dml.c b/source/dml/tr_181/ml/cosa_wifi_dml.c index 330448ba4..899e1590f 100755 --- a/source/dml/tr_181/ml/cosa_wifi_dml.c +++ b/source/dml/tr_181/ml/cosa_wifi_dml.c @@ -86,7 +86,8 @@ #include "wifi_webconfig.h"//ONE_WIFI #endif -#if defined(_COSA_BCM_MIPS_) || defined(_XB6_PRODUCT_REQ_) || defined(_COSA_BCM_ARM_) || defined(_PLATFORM_TURRIS_) || defined(_XER5_PRODUCT_REQ_) || defined(_SCER11BEL_PRODUCT_REQ_) +#if defined(_COSA_BCM_MIPS_) || defined(_XB6_PRODUCT_REQ_) || defined(_COSA_BCM_ARM_) || defined(_PLATFORM_TURRIS_) || \ + defined(_XER5_PRODUCT_REQ_) || defined(_SCER11BEL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_) #include "ccsp_base_api.h" #include "messagebus_interface_helper.h" diff --git a/source/utils/wifi_util.c b/source/utils/wifi_util.c index 105297728..5cc5a754b 100644 --- a/source/utils/wifi_util.c +++ b/source/utils/wifi_util.c @@ -2055,7 +2055,7 @@ int get_radio_if_hw_type(unsigned int radio_index, char *str, int str_len) else { snprintf(str, str_len, "QCN6224"); } -#elif defined (_SCER11BEL_PRODUCT_REQ_) +#elif defined (_SCER11BEL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_) if (radio_index == 0) { } else { diff --git a/source/webconfig/wifi_ovsdb_translator.c b/source/webconfig/wifi_ovsdb_translator.c index 67522f9b3..ad84defe7 100644 --- a/source/webconfig/wifi_ovsdb_translator.c +++ b/source/webconfig/wifi_ovsdb_translator.c @@ -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 (_SCXF11BFL_PRODUCT_REQ_) struct ovs_vapname_cloudvifname_map cloud_vif_map[] = { {"bhaul-ap-24", "mesh_backhaul_2g"}, {"bhaul-ap-l50", "mesh_backhaul_5gl"}, @@ -917,13 +919,13 @@ webconfig_error_t translator_ovsdb_init(webconfig_subdoc_data_t *data) default_vap_info->u.bss_info.interworking.interworking.venueType = 0; #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 (!is_vap_mesh_sta(&hal_cap->wifi_prop, vapIndex)) { default_vap_info->u.bss_info.hostap_mgt_frame_ctrl = true; } #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 (is_vap_private(&hal_cap->wifi_prop, vapIndex) == TRUE) { default_vap_info->u.bss_info.network_initiated_greylist = false; default_vap_info->u.bss_info.vapStatsEnable = true; From 6c91aa22421cb29c2d676735c8104e222031bb30 Mon Sep 17 00:00:00 2001 From: vysakhav Date: Fri, 19 Dec 2025 09:31:18 +0000 Subject: [PATCH 2/4] XF10-34: Correct the merge conflicts when taken PR into stable2 Test Procedure: Resolve merge conflicts Priority:P2 Signed-off-by: vysakhav --- source/db/wifi_db.c | 3 +-- source/db/wifi_db_apis.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/db/wifi_db.c b/source/db/wifi_db.c index befd6487a..19b5b2348 100644 --- a/source/db/wifi_db.c +++ b/source/db/wifi_db.c @@ -496,8 +496,7 @@ static int init_vap_config_default(int vap_index, wifi_vap_info_t *config, /*For XER5/XB10/XER10 2.4G XHS is disable by default*/ #if defined(_XER5_PRODUCT_REQ_) || defined(_XB10_PRODUCT_REQ_) || defined(_SCER11BEL_PRODUCT_REQ_) || \ defined(_SCXF11BFL_PRODUCT_REQ_) - if (isVapLnf(vap_index) || isVapPrivate(vap_index) || - isVapMeshBackhaul(vap_index) || isVapXhs(vap_index)) { + if (isVapLnfSecure(vap_index) || isVapPrivate(vap_index)) { cfg.u.bss_info.enabled = true; } #else diff --git a/source/db/wifi_db_apis.c b/source/db/wifi_db_apis.c index 3ca967805..64cb97caf 100644 --- a/source/db/wifi_db_apis.c +++ b/source/db/wifi_db_apis.c @@ -7250,7 +7250,7 @@ int wifidb_init_vap_config_default(int vap_index, wifi_vap_info_t *config, } #if defined(_XER5_PRODUCT_REQ_) || defined(_XB10_PRODUCT_REQ_) || defined(_SCER11BEL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_) - if (isVapLnf(vap_index) || isVapPrivate(vap_index)) { + if (isVapLnfSecure(vap_index) || isVapPrivate(vap_index)) { cfg.u.bss_info.enabled = true; } #else From 5252f9f760c601ed4cc467789d051bc3976f0189 Mon Sep 17 00:00:00 2001 From: vysakhav Date: Fri, 19 Dec 2025 11:35:29 +0000 Subject: [PATCH 3/4] Fix up missing code when resolve conflict --- scripts/OneWiFi_Selfheal.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/OneWiFi_Selfheal.sh b/scripts/OneWiFi_Selfheal.sh index ee39db0ea..94337dc8f 100644 --- a/scripts/OneWiFi_Selfheal.sh +++ b/scripts/OneWiFi_Selfheal.sh @@ -400,7 +400,7 @@ do fi fi - if [ "$MODEL_NUM" == "CGM4981COM" ] || [ "${MODEL_NUM}" = "CGM601TCOM" ] || [ "${MODEL_NUM}" = "SG417DBCT" ] || [ "${MODEL_NUM}" == "SCER11BEL" ] || [ "$MODEL_NUM" == "SCXF11BFL" ]; then + if [ "$MODEL_NUM" == "$CGM49" ] || [ "${MODEL_NUM}" = "CGM601TCOM" ] || [ "${MODEL_NUM}" = "CWA438TCOM" ] || [ "${MODEL_NUM}" = "SG417DBCT" ] || [ "${MODEL_NUM}" == "SCER11BEL" ] || [ "$MODEL_NUM" == "SCXF11BFL" ]; then if [ $eco_mode_6g == "false" ]; then radio_status_6g=`dmcli eRT getv Device.WiFi.Radio.$radio_6g_instance.Enable | grep "value:" | cut -f2- -d:| cut -f2- -d:` if [ $radio_status_6g == "true" ]; then From 8f9cffb9e359ea44dfd0d7a77940df57401603d1 Mon Sep 17 00:00:00 2001 From: vivianecordeiro-sky Date: Tue, 23 Dec 2025 10:39:30 +0000 Subject: [PATCH 4/4] Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- scripts/mesh_setip.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mesh_setip.sh b/scripts/mesh_setip.sh index 172dff525..cf7b2d4d8 100755 --- a/scripts/mesh_setip.sh +++ b/scripts/mesh_setip.sh @@ -69,7 +69,7 @@ secBhaulEnable=`syscfg get SecureBackhaul_Enable` wifiDynamicProfile=`sysevent get wifiDynamicProfile` # 0 - LnF, 1 - mesh onboarding if [ "x$ovs_enable" = "xtrue" ] || [ "x$bridgeUtilEnable" = "xtrue" ] ; then - if [ "$MODEL_NUM" == "$CGM43" ] || [ "$MODEL_NUM" == "$CGM49" ] || [ "$MODEL_NUM" == "CGM601TCOM" ] || [ "$MODEL_NUM" == "CWA438TCOM" ] || [ "$MODEL_NUM" == "SG417DBCT" ] || [ "$MODEL_NUM" == "SCER11BEL" ] || [ "$MODEL_NUM" == "SCXF11BFL" ] || [ "$MODEL_NUM" == "VTER11QEL" ] || [ "$MODEL_NUM" == "SR300" ] || [ "$MODEL_NUM" == "SE501" ] || [ "$MODEL_NUM" == "$WNX" ] || [ "$MODEL_NUM" == "$TG4" ] || [ "$MODEL_NUM" == "SR213" ] || [ "$MODEL_NUM" == "$CGA4" ]; then + if [ "$MODEL_NUM" == "$CGM43" ] || [ "$MODEL_NUM" == "$CGM49" ] || [ "$MODEL_NUM" == "CGM601TCOM" ] || [ "$MODEL_NUM" == "CWA438TCOM" ] || [ "$MODEL_NUM" == "SG417DBCT" ] || [ "$MODEL_NUM" == "SCER11BEL" ] || [ "$MODEL_NUM" == "SCXF11BFL" ] || [ "$MODEL_NUM" == "VTER11QEL" ] || [ "$MODEL_NUM" == "SR300" ] || [ "$MODEL_NUM" == "SE501" ] || [ "$MODEL_NUM" == "$WNX" ] || [ "$MODEL_NUM" == "$TG4" ] || [ "$MODEL_NUM" == "SR213" ] || [ "$MODEL_NUM" == "$CGA4" ]; then USE_BRIDGEUTILS=1 fi fi