Merge pull request #1 from rdkcentral/develop

Update to latest

Author: pratheepa1995

NOTICE

@@ -8,3 +8,5 @@ Licensed under the Apache License, Version 2.0
 
 Copyright [2014] [Cisco Systems, Inc.]
 Licensed under the Apache License, Version 2.0
+
+Some material is derived from openembedded.org or the yocto project  and is licensed in the same manner here (MIT for metadata; source code to match the associated recipe license).

conf/distro/include/rdk-bpi.inc

@@ -10,13 +10,13 @@ CFLAGS_append  = " ${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', '
 DISTRO_FEATURES_append = " halVersion3"
 
 #rdk-wifi-libhostap support for broadband
-DISTRO_FEATURES_append = " HOSTAPD_2_10"
+DISTRO_FEATURES_append = " HOSTAPD_2_11"
 
 # OneWifi feature
 DISTRO_FEATURES_append = " OneWifi"
 
 # MacFilter Feature
-DISTRO_FEATURES_append = " acl_nl_support"
+DISTRO_FEATURES_append = " disable_nl80211_acl"
 
 #No Moca Support
 DISTRO_FEATURES_append = " no_moca_support"
@@ -40,3 +40,10 @@ DISTRO_FEATURES_append = " sdmmc"
 
 #PPP Feature
 #DISTRO_FEATURES_append = "ppp-enabled"
+
+#disabling lan0_as_wan to allow lan0 interface to come
+DISTRO_FEATURES_remove = " lan0_as_wan"
+
+#Need to enable below distro once required changes are merged 
+#DISTRO_FEATURES_append = " EasyMesh"
+PREFERRED_VERSION_go = "1.19.%"

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi-libwebconfig.bbappend

@@ -1,4 +1,26 @@
 SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=libwebconfig"
 
 SRC_URI = "git://github.com/rdkcentral/OneWifi.git;protocol=https;branch=develop;name=libwebconfig"
-SRCREV_libwebconfig = "7d4697bc74017e0ec57c3ba903a70dfe56809cb4"
+SRCREV_libwebconfig = "3962d0b1f141bc1f00ef81ff25c2a36bcd5cf4e2"
+
+DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap unified-wifi-mesh-header ', '', d)}"
+EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-easymesh ', '', d)}"
+EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-em-app ', '', d)}"
+
+CFLAGS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' -Wno-error=maybe-uninitialized -Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=incompatible-pointer-types -Wno-error=sign-compare -Wno-error -DEASY_MESH_NODE  ', '', d)}"
+
+CFLAGS_append = " -Wno-enum-conversion"
+
+do_compile_append() {
+    oe_runmake -C source/platform
+}
+
+do_install_append() {
+       oe_runmake -C source/platform DESTDIR=${D} install
+      install -m 644 ${S}/include/webconfig_external_proto_easymesh.h  ${D}/usr/include/ccsp
+}
+
+FILES_${PN} += " \
+    ${libdir}/libwifi_bus.so* \
+"
+

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend

@@ -4,13 +4,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=OneWifi"
 SRC_URI = "git://github.com/rdkcentral/OneWifi.git;protocol=https;branch=develop;name=OneWifi"
-SRCREV_OneWifi = "7d4697bc74017e0ec57c3ba903a70dfe56809cb4"
+SRCREV_OneWifi = "3962d0b1f141bc1f00ef81ff25c2a36bcd5cf4e2"
 DEPENDS_append = " mesh-agent "
+DEPENDS_remove = " opensync "
+DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap ', '', d)}"
 
 CFLAGS_append = " -DWIFI_HAL_VERSION_3 -Wno-unused-function "
 LDFLAGS_append = " -ldl"
 CFLAGS_append_aarch64 = " -Wno-error "
 
+EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-em-app ', '', d)}"
+CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' -DEASY_MESH_NODE ', '', d)}"
+
 SRC_URI += " \
     file://checkwifi.sh \
     file://onewifi_pre_start.sh \

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/onewifi_pre_start.sh

@@ -1,5 +1,13 @@
 #!/bin/sh
 sleep 20
+
+#To update al_mac_addr in EasyMeshCfg.json to avoid onewifi restarting during fresh boot-up
+wan_mac="$(cat /sys/class/ieee80211/phy0/macaddress)"
+old_al_mac_addr=`cat /nvram/EasymeshCfg.json | grep AL_MAC_ADDR  | cut -d '"' -f4`
+if [ "$old_al_mac_addr" == "00:00:00:00:00:00" ]; then
+  sed -i "s/$old_al_mac_addr/$wan_mac/g" /nvram/EasymeshCfg.json
+fi  
+
 iw phy phy0 interface add wifi0 type __ap
 iw phy phy0 interface add wifi1 type __ap
 iw phy phy0 interface add wifi2 type __ap

meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/EasymeshCfg.json

@@ -0,0 +1,6 @@
+{
+	"AL_MAC_ADDR":	"00:00:00:00:00:00",
+	"Colocated_mode":	1,
+	"Backhaul_SSID":	"mesh_backhaul",
+	"Backhaul_KeyPassphrase":	"test-backhaul"
+}

meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/hal_interface.patch

@@ -0,0 +1,83 @@
+################################################
+#From: 2deb7d57df61e41ae71d8431bbc62dabeae8b660,
+#      a1a55d64c1240a1f9cf34dcd1cdde9b29070cc6d
+#Subject: Add callback func to get AKM and wpa3 comp enum
+#Source: COMCAST
+#Signed-off-by:[email protected]
+################################################
+diff --git a/wifi_hal_ap.h b/wifi_hal_ap.h
+index f5c37db..7daf939 100644
+--- a/wifi_hal_ap.h
++++ b/wifi_hal_ap.h
+@@ -349,7 +349,8 @@ typedef enum
+     WIFI_RADIO_SCAN_MODE_FULL,
+     WIFI_RADIO_SCAN_MODE_ONCHAN,
+     WIFI_RADIO_SCAN_MODE_OFFCHAN,
+-    WIFI_RADIO_SCAN_MODE_SURVEY
++    WIFI_RADIO_SCAN_MODE_SURVEY,
++    WIFI_RADIO_SCAN_MODE_SELECT_CHANNELS
+ } wifi_neighborScanMode_t;
+ 
+ /**
+@@ -2736,6 +2737,14 @@ typedef struct {
+ } __attribute__((packed)) wifi_back_haul_sta_t;
+ 
+ #define WIFI_AP_MAX_SSID_LEN    33
++/**
++ * @brief Maximum length of the vendor information elements buffer
++ *
++ * Not a standard value, but a reasonable maximum for vendor elements
++ * Computed by taking Max MPDU size - ~ MAX 802.11 header size - 802.11 FCS size - ~Size of required IEs
++ * 2,310 is divisible by the typical Vendor IE size (7 = IE Type[1] + IE Length[1] + OUI[3] + VIE Type[1] + VIE Subtype [1])
++ */
++#define WIFI_AP_MAX_VENDOR_IE_LEN 2310	
+ typedef struct {
+     CHAR    ssid[WIFI_AP_MAX_SSID_LEN];
+     BOOL    enabled;
+@@ -2763,6 +2772,8 @@ typedef struct {
+     UINT   wmmNoAck;
+     UINT   wepKeyLength;
+     BOOL   bssHotspot;
++    UINT   vendor_elements_len;
++    UCHAR  vendor_elements[WIFI_AP_MAX_VENDOR_IE_LEN];
+     UINT   wpsPushButton;
+     char   beaconRateCtl[32];
+     BOOL   network_initiated_greylist;
+@@ -2919,4 +2930,4 @@ INT wifi_hal_analytics_callback_register(wifi_analytics_callback callback);
+ }
+ #endif
+ 
+-#endif
+\ No newline at end of file
++#endif
+diff --git a/wifi_hal_generic.h b/wifi_hal_generic.h
+index a55ede6..c8ca1a8 100644
+--- a/wifi_hal_generic.h
++++ b/wifi_hal_generic.h
+@@ -832,6 +832,7 @@ typedef struct {
+      BOOL radio_presence[MAX_NUM_RADIOS];         /**< Indicates if the interfaces is present (not in deep sleep)*/
+      wifi_multi_link_info_t mu_info;
+      UINT BssMaxStaAllow;                    /**< Maximum number of stations supported for given platform. Gets populated during bring-up. */
++     UINT colocated_mode;
+ 
+     //Device Information related fields
+      CHAR manufacturer[DEFAULT_DEVICE_FIELD_LEN];
+diff --git a/wifi_hal_telemetry.h b/wifi_hal_telemetry.h
+index 6867002..3596ea0 100644
+--- a/wifi_hal_telemetry.h
++++ b/wifi_hal_telemetry.h
+@@ -102,6 +102,7 @@ typedef struct _wifi_neighbor_ap2
+      CHAR  ap_SupportedDataTransferRates[256];  /**< Comma-separated list (maximum list length 256) of strings. Data transmit rates (in Mbps) for unicast frames at which the SSID will permit a station to connect. For example, ifSupportedDataTransferRatesis "1,2,5.5", this indicates that the SSID will only permit connections at 1 Mbps, 2 Mbps and 5.5 Mbps. */
+      UINT  ap_DTIMPeriod;   /**< The number of beacon intervals that elapse between transmission of Beacon frames containing a TIM element whose DTIM count field is 0. This value is transmitted in the DTIM Period field of beacon frames. [802.11-2012] */
+      UINT  ap_ChannelUtilization;   /**< Indicates the fraction of the time AP senses that the channel is in use by the neighboring AP for transmissions. */
++     UINT  ap_freq;    /**< Frequency. */
+ } wifi_neighbor_ap2_t;    //COSA_DML_NEIGHTBOURING_WIFI_RESULT
+ 
+ /*    Explanation:
+@@ -338,4 +339,4 @@ INT wifi_getVAPTelemetry(UINT apIndex, wifi_VAPTelemetry_t *telemetry);
+ }
+ #endif
+ 
+-#endif
+\ No newline at end of file
++#endif

meta-rdk-mtk-bpir4/recipes-ccsp/hal/halinterface.bbappend

@@ -1 +1,15 @@
 CFLAGS_append = " -DWIFI_HAL_VERSION_3"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://hal_interface.patch;apply=no "
+#need to remove this patch once this changes merged in rdk-next
+do_hal_interface_patches() {
+    cd ${S}
+    if [ ! -e patch_applied ]; then
+        bbnote "Patching hal_interface.patch"
+        patch -p1 < ${WORKDIR}/hal_interface.patch
+
+       touch patch_applied
+    fi
+}
+addtask hal_interface_patches after do_unpack before do_configure

meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-hal.bbappend

@@ -1,27 +1,28 @@
-SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/hal/rdk-wifi-hal;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=rdk-wifi-hal"
+SRC_URI_remove = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=main;name=rdk-wifi-hal"
 
 SRC_URI += "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=develop;name=rdk-wifi-hal"
-SRCREV_rdk-wifi-hal = "51ce6f510012f1d3989bbe7141429498c9158d82"
+SRCREV_rdk-wifi-hal = "a8bdea1dce2761060f54e4dfe8e69af19f3d9b1f"
 
 CFLAGS_append = " -D_PLATFORM_BANANAPI_R4_  -DBANANA_PI_PORT  -DFEATURE_SINGLE_PHY "
 CFLAGS_append_kirkstone = " -fcommon"
+CFLAGS_remove = "-DCONFIG_MBO"
 EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' ONE_WIFIBUILD=true ', '', d)}"
 EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' BANANA_PI_PORT=true ', '', d)}"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI += " \
   file://InterfaceMap.json \
+  file://EasymeshCfg.json \
 "
 
-SRC_URI += " file://6g_interface_added_in_bridge.patch;patchdir=../"
-
 # Install InterfaceMap.json in /nvram
 do_install_append() {
   install -d ${D}/nvram
   install -m 0644 ${WORKDIR}/InterfaceMap.json ${D}/nvram/InterfaceMap.json
+  install -m 0644 ${WORKDIR}/EasymeshCfg.json  ${D}/nvram 
 }
 
 FILES_${PN} += " \
-  /nvram/InterfaceMap.json \
+  /nvram/* \
 "

meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-util.bbappend

@@ -1,6 +1,4 @@
-SRC_URI_remove += "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/hal/rdk-wifi-hal;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=rdk-wifi-util"
-
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=5d50b1d1fb741ca457897f9e370bc747"
+SRC_URI_remove = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=main;name=rdk-wifi-util"
 
 SRC_URI = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=develop;name=rdk-wifi-util"
-SRCREV_rdk-wifi-util = "51ce6f510012f1d3989bbe7141429498c9158d82"
+SRCREV_rdk-wifi-util = "a8bdea1dce2761060f54e4dfe8e69af19f3d9b1f"