Merge branch 'develop' into update_uwm_and_depends_src_rev

Author: ap934

conf/machine/bananapi4-rdk-broadband-ap-extender.conf

@@ -6,9 +6,10 @@
 
 RUST_PANIC_STRATEGY="abort"
 
+require conf/distro/include/rdk-bpi-ap-extender.inc
+
 require ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','conf/machine/filogic880-kernel6-6-bpi-r4.conf','conf/machine/filogic880-bpi-r4.conf',d)}
 DISTRO_FEATURES_append = " em_extender"
-require conf/distro/include/rdk-bpi-ap-extender.inc 
 PREFERRED_PROVIDER_hal-wifi_onewifi = "hal-wifi-generic"
 MACHINE_IMAGE_NAME = "rdk-generic-ap-extender-image"
 

meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/files/2.11/mlo_fix.patch

@@ -0,0 +1,24 @@
+##########################################
+Date: Oct 30, 2025 1:00 PM
+From: 
+Subject: Fixed MLO enable API
+Source: Comcast
+Upstream-Status:
+Signed-off-by: Bogdan Bogush <[email protected]>
+##########################################
+diff --git a/source/hostap-2.11/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+index 8cbaf0db8..e3cd9e47c 100644
+--- a/source/hostap-2.11/src/ap/ieee802_11.c
++++ b/source/hostap-2.11/src/ap/ieee802_11.c
+@@ -4773,9 +4773,11 @@ bool hostapd_is_mld_ap(struct hostapd_data *hapd)
+ 	if (!hapd->conf->mld_ap)
+ 		return false;
+ 
++#ifndef RDK_ONEWIFI
+ 	if (!hapd->iface || !hapd->iface->interfaces ||
+ 	    hapd->iface->interfaces->count <= 1)
+ 		return false;
++#endif /* RDK_ONEWIFI */
+ 
+ 	return true;
+ }

meta-rdk-mtk-bpir4/recipes-ccsp/rdk-wifi-libhostap/rdk-wifi-libhostap_2.11.bb

@@ -66,6 +66,7 @@ SRC_URI += " \
     file://2.11/mdu_radius_psk_auth_2_11.patch \
     file://2.11/supplicant_new.patch \
     file://2.11/bpi.patch \
+    file://2.11/mlo_fix.patch \
     "
 
 CFLAGS_append = " -D_PLATFORM_BANANAPI_R4_  -DCONFIG_SME -DCONFIG_GAS -DCONFIG_AP "

meta-rdk-mtk-bpir4/recipes-kernel/linux/files/netfilter.cfg

@@ -56,7 +56,7 @@ CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_RAW=y
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m

meta-rdk-mtk-bpir4/recipes-kernel/linux/files/rdkb_cfg/kernel_6_6.cfg

@@ -1,4 +1,9 @@
 CONFIG_USB=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_UAS=y
+CONFIG_USB_XHCI_MTK_DEBUGFS=y
 CONFIG_USB_NET_DRIVERS=y
 CONFIG_USB_USBNET=y
 CONFIG_USB_XHCI_HCD=y

meta-rdk-mtk-bpir4/recipes-kernel/linux/files/rdkb_cfg/sdmmc.cfg

@@ -3,3 +3,10 @@ CONFIG_EXT4_ENCRYPTION=y
 CONFIG_EXT4_FS=y 
 CONFIG_EXT4_FS_POSIX_ACL=y 
 CONFIG_EXT4_FS_SECURITY=y 
+CONFIG_NF_LOG_IPV6=y
+CONFIG_NETFILTER_XT_TARGET_CT=y
+CONFIG_CGROUP_DEBUG=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_CGROUP_CPUACCT=y

meta-rdk-mtk-bpir4/recipes-wifi/hal/files/6g_dml_mapping.patch

@@ -1802,15 +1802,6 @@ index faee674..ecf1f17 100644
      if (wifi_getRadioEnable(index, &enabled) != RETURN_OK)
      {
          fprintf(stderr, "%s: wifi_getRadioEnable return error.\n", __func__);
-@@ -12901,7 +13373,7 @@ INT wifi_getRadioOperatingParameters(wifi_radio_index_t index, wifi_radio_operat
-     }
- 
-     if (operationParam->band == WIFI_FREQUENCY_6_BAND) {
--        if (wifi_getRadioOpclass(index, &operationParam->op_class) != RETURN_OK) {
-+        if (wifi_getRadioOpclass(index, &operationParam->operatingClass) != RETURN_OK) {
-             fprintf(stderr, "%s: op_class is not set.\n", __func__);
-             return RETURN_ERR;
-         }
 @@ -13018,7 +13490,10 @@ static int array_index_to_vap_index(UINT radioIndex, int arrayIndex)
          return RETURN_ERR;
      }