Merge branch 'rdkcentral:develop' into dpp_changes

sriraaman-c · web-flow · commit 4670aa66dd11 · 2025-11-07T11:13:08.000+05:30
diff --git a/build/linux/bpi/setup.sh b/build/linux/bpi/setup.sh
@@ -2,7 +2,7 @@
 
 ONEWIFI_DIR=$(pwd)
 HOSTAP_DIR="$(pwd)/../rdk-wifi-libhostap/source"
-UPSTREAM_HOSTAP_URL="git://w1.fi/hostap.git"
+UPSTREAM_HOSTAP_URL="https://git.w1.fi/hostap.git"
 SRCREV_2_10="9d07b9447e76059a2ddef2a879c57d0934634188"
 
 #git clone other wifi related components
diff --git a/build/linux/rpi/setup.sh b/build/linux/rpi/setup.sh
@@ -2,7 +2,7 @@
 
 ONEWIFI_DIR=$(pwd)
 HOSTAP_DIR="$(pwd)/../rdk-wifi-libhostap/source"
-UPSTREAM_HOSTAP_URL="git://w1.fi/hostap.git"
+UPSTREAM_HOSTAP_URL="https://git.w1.fi/hostap.git"
 SRCREV_2_10="9d07b9447e76059a2ddef2a879c57d0934634188"
 
 #git clone other wifi related components
diff --git a/build/openwrt/makefile b/build/openwrt/makefile
@@ -256,7 +256,7 @@ HOSTAP_LIB_FLAGS +=  -DHOSTAPD_2_11 -DCONFIG_WEP -DFEATURE_SUPPORT_RADIUSGREYLIS
                          -DNO_SUPPLICANT -DCONFIG_DRIVER_NL80211  -DEAP_SERVER_MD5 -DEAP_SERVER_TLS -DEAP_SERVER_UNAUTH_TLS -DEAP_SERVER_PEAP -DEAP_SERVER_TTLS -DEAP_SERVER_MSCHAPV2 -DEAP_SERVER_GTC -DEAP_SERVER_PAX -DEAP_SERVER_PSK -DEAP_SERVER_SAKE -DEAP_SERVER_GPSK -DEAP_GPSK_SHA256 -DEAP_SERVER_PWD \
                          -DCONFIG_WPS -DEAP_SERVER_WSC -DCONFIG_WPS_TESTING -DEAP_SERVER_IKEV2 -DEAP_SERVER_TNC -DEAP_SERVER_IDENTITY -DEAP_SERVER -DPKCS12_FUNCS -DEAP_TLS_FUNCS -DCONFIG_TLSV11 -DCONFIG_TLSV12 -DCONFIG_TLS_OPENSSL -DCRYPTO_RSA_OAEP_SHA256 -DTLS_DEFAULT_CIPHERS=\""DEFAULT:!EXP:!LOW"\" -DCONFIG_DES \
                          -DCONFIG_HMAC_SHA256_KDF -DALL_DH_GROUPS -DCONFIG_ECC -DCONFIG_IPV6 -DNEED_AP_MLME -DCONFIG_PROXYARP -DCONFIG_ACS -DCONFIG_DEBUG_LINUX_TRACING -DCONFIG_DEBUG_FILE -DEAP_TLS -DEAP_UNAUTH_TLS -DEAP_PEAP -DEAP_TTLS -DEAP_MD5 -DEAP_MSCHAPv2 -DEAP_GTC -DEAP_OTP -DEAP_LEAP -DEAP_PSK -DEAP_PAX \
-                         -DEAP_SAKE -DEAP_GPSK -DEAP_PWD -DIEEE8021X_EAPOL -DCONFIG_IEEE80211W -DRDK_ONEWIFI -DCONFIG_GENERIC_MLO -fPIC -DPIC
+                         -DEAP_SAKE -DEAP_GPSK -DEAP_PWD -DIEEE8021X_EAPOL -DCONFIG_IEEE80211W -DRDK_ONEWIFI -DCONFIG_GENERIC_MLO -DCONFIG_MLO -fPIC -DPIC
 
 # wifi agent rules
 
diff --git a/build/openwrt/setup.sh b/build/openwrt/setup.sh
@@ -7,7 +7,7 @@ HOSTAP_SRC_DIR="$HOSTAP_DIR/source"
 HOSTAP_PATCH_DIR="$HOSTAP_DIR/meta-cmf-bananapi/meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/files/2.11"
 RDK_WIFI_HAL_DIR="$(pwd)/../rdk-wifi-hal"
 KERNEL_PATCH_DIR="$RDK_WIFI_HAL_DIR/platform/banana-pi/kernel-patches/openwrt"
-UPSTREAM_HOSTAP_URL="git://w1.fi/hostap.git"
+UPSTREAM_HOSTAP_URL="https://git.w1.fi/hostap.git"
 SRCREV_2_11="96e48a05aa0a82e91e3cab75506297e433e253d0"
 
 #git clone other wifi related components
diff --git a/config/TR181-WiFi-USGv2.XML b/config/TR181-WiFi-USGv2.XML
@@ -3362,6 +3362,11 @@ INSTMSMT_PH2 -->
                             	    <type>unsignedInt</type>
                             	    <syntax>uint32</syntax>
                         	</parameter>
+                        	<parameter>
+                            	    <name>X_RDK_CapSpaStr</name>
+                            	    <type>unsignedInt[0:8]</type>
+                            	    <syntax>uint32</syntax>
+                        	</parameter>
                             </parameters>
 
 			<objects>
diff --git a/config/bus_dml_config.json b/config/bus_dml_config.json
@@ -1508,6 +1508,12 @@
 										"writable": false
 									}
 								},
+								{
+									"X_RDK_CapSpaStr": {
+										"type": "uint32_t",
+										"writable": false
+									}
+								},
 								{
 									"MACAddress": {
 										"type": "macaddr_t",
diff --git a/config/openwrt/banana-pi/etc/init.d/onewifi b/config/openwrt/banana-pi/etc/init.d/onewifi
@@ -32,6 +32,12 @@ start_service() {
         touch /tmp/onewifi_bootup_completed  # Create flag to ensure it's not run again
     fi
 
+    # Create the directory for core dumps if it doesn't exist
+    mkdir -p /tmp/cores
+
+    # Set the core dump pattern for the kernel
+    sysctl -w kernel.core_pattern="/tmp/cores/core.%e.%p.%t"
+
     # Use procd to manage the OneWifi process
     procd_open_instance
     procd_set_param command /bin/sh -c "ulimit -c unlimited && exec /usr/bin/OneWifi -c"
diff --git a/source/dml/tr_181/ml/cosa_wifi_dml.c b/source/dml/tr_181/ml/cosa_wifi_dml.c
@@ -16636,6 +16636,13 @@ AssociatedDevice1_GetParamUlongValue
         return TRUE;
     }
 
+    if( AnscEqualString(ParamName, "X_RDK_CapSpaStr", TRUE))
+    {
+        /* collect value */
+        *puLong = assoc_dev_data->dev_stats.cli_activeNumSpatialStreams;
+        free(assoc_dev_data);
+        return TRUE;
+    }
 
     /* CcspTraceWarning(("Unsupported parameter '%s'\n", ParamName)); */
     free(assoc_dev_data);
diff --git a/source/platform/common/data_model/wifi_dml_cb.c b/source/platform/common/data_model/wifi_dml_cb.c
@@ -4062,6 +4062,8 @@ bool associated_sta_get_param_uint_value(void *obj_ins_context, char *param_name
         *output_value = assoc_dev_data->dev_stats.cli_Disassociations;
     } else if( STR_CMP(param_name, "X_COMCAST-COM_AuthenticationFailures")) {
         *output_value = assoc_dev_data->dev_stats.cli_AuthenticationFailures;
+    } else if( STR_CMP(param_name, "X_RDK_CapSpaStr")) {
+        *output_value = assoc_dev_data->dev_stats.cli_activeNumSpatialStreams;
     } else {
         wifi_util_info_print(WIFI_DMCLI,"%s:%d: unsupported param name:%s\n",__func__, __LINE__, param_name);
         return false;
diff --git a/source/stats/wifi_monitor.c b/source/stats/wifi_monitor.c
@@ -1052,6 +1052,7 @@ int get_sta_stats_info (assoc_dev_data_t *assoc_dev_data) {
     assoc_dev_data->dev_stats.cli_MaxRSSI = sta_data->dev_stats.cli_MaxRSSI;
     assoc_dev_data->dev_stats.cli_Disassociations = sta_data->dev_stats.cli_Disassociations;
     assoc_dev_data->dev_stats.cli_AuthenticationFailures = sta_data->dev_stats.cli_AuthenticationFailures;
+    assoc_dev_data->dev_stats.cli_activeNumSpatialStreams = sta_data->dev_stats.cli_activeNumSpatialStreams;
     assoc_dev_data->dev_stats.cli_PacketsSent = sta_data->dev_stats.cli_PacketsSent;
     assoc_dev_data->dev_stats.cli_PacketsReceived = sta_data->dev_stats.cli_PacketsReceived;
     assoc_dev_data->dev_stats.cli_ErrorsSent = sta_data->dev_stats.cli_ErrorsSent;
diff --git a/source/webconfig/wifi_decoder.c b/source/webconfig/wifi_decoder.c
@@ -3663,6 +3663,14 @@ webconfig_error_t decode_associated_clients_object(webconfig_subdoc_data_t *data
             }
             assoc_dev_data.dev_stats.cli_AuthenticationFailures = value_object->valuedouble;
 
+
+            value_object = cJSON_GetObjectItem(assoc_client, "ActiveNumSpatialStreams");
+            if ((value_object == NULL) || (cJSON_IsNumber(value_object) == false)) {
+                wifi_util_error_print(WIFI_WEBCONFIG, "%s:%d: Validation Failed\n", __func__, __LINE__);
+                return webconfig_error_decode;
+            }
+            assoc_dev_data.dev_stats.cli_activeNumSpatialStreams = value_object->valuedouble;
+
             value_object = cJSON_GetObjectItem(assoc_client, "PacketsSent");
             if ((value_object == NULL) || (cJSON_IsNumber(value_object) == false)) {
                 wifi_util_error_print(WIFI_WEBCONFIG, "%s:%d: Validation Failed\n", __func__, __LINE__);
diff --git a/source/webconfig/wifi_encoder.c b/source/webconfig/wifi_encoder.c
@@ -1803,6 +1803,7 @@ webconfig_error_t encode_associated_client_object(rdk_wifi_vap_info_t *rdk_vap_i
                 cJSON_AddNumberToObject(obj_assoc_client, "MaxRSSI", assoc_dev_data->dev_stats.cli_MaxRSSI);
                 cJSON_AddNumberToObject(obj_assoc_client, "Disassociations", assoc_dev_data->dev_stats.cli_Disassociations);
                 cJSON_AddNumberToObject(obj_assoc_client, "AuthenticationFailures", assoc_dev_data->dev_stats.cli_AuthenticationFailures);
+                cJSON_AddNumberToObject(obj_assoc_client, "ActiveNumSpatialStreams", assoc_dev_data->dev_stats.cli_activeNumSpatialStreams);
                 cJSON_AddNumberToObject(obj_assoc_client, "PacketsSent", assoc_dev_data->dev_stats.cli_PacketsSent);
                 cJSON_AddNumberToObject(obj_assoc_client, "PacketsReceived", assoc_dev_data->dev_stats.cli_PacketsReceived);
                 cJSON_AddNumberToObject(obj_assoc_client, "ErrorsSent", assoc_dev_data->dev_stats.cli_ErrorsSent);

Original file line number	Diff line number	Diff line change
`@@ -1508,6 +1508,12 @@`
`1508`	`1508`	`"writable": false`
`1509`	`1509`	`}`
`1510`	`1510`	`},`
	`1511`	`+ {`
	`1512`	`+ "X_RDK_CapSpaStr": {`
	`1513`	`+ "type": "uint32_t",`
	`1514`	`+ "writable": false`
	`1515`	`+ }`
	`1516`	`+ },`
`1511`	`1517`	`{`
`1512`	`1518`	`"MACAddress": {`
`1513`	`1519`	`"type": "macaddr_t",`