Merge "[Feature][L803-1][USB]Not connected to VBUS, supports hot-swap, uses enumerations. // Only Configure:No, Affected branch:T800M_M.2, Affected module:USB, Is it affected on both ZXIC and MTK:only MTK, Self-test:Yes, Doc Update:No." into MR3.0-merge
diff --git a/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb b/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb
index 78c93ab..963310b 100755
--- a/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb
+++ b/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb
@@ -146,6 +146,7 @@
mcf-cmd \
openssl-bin \
rng-tools \
+ ${@bb.utils.contains("MOBILETEK_NFS_CFG", "PLATFORM", "nfs-utils", "", d)} \
"
do_populate_sdk_prepend() {
diff --git a/src/kernel/linux/v4.19/arch/arm64/configs/auto2735evb_defconfig b/src/kernel/linux/v4.19/arch/arm64/configs/auto2735evb_defconfig
old mode 100644
new mode 100755
index e6722bb..4497f06
--- a/src/kernel/linux/v4.19/arch/arm64/configs/auto2735evb_defconfig
+++ b/src/kernel/linux/v4.19/arch/arm64/configs/auto2735evb_defconfig
@@ -805,3 +805,6 @@
# CONFIG_MMSTAT_TRACER is not set
CONFIG_MEMTEST=y
CONFIG_DEBUG_ALIGN_RODATA=y
+# hq add nfs at 20230724 for [feature][zk33]syslog mdlog export begin
+CONFIG_NFS_FS=y
+# hq add nfs at 20230724 for [feature][zk33]syslog mdlog export end
diff --git a/src/lynq/lib/liblynq-network/lynq_module_state_buffer.cpp b/src/lynq/lib/liblynq-network/lynq_module_state_buffer.cpp
index 1d0b5af..669dd3c 100755
--- a/src/lynq/lib/liblynq-network/lynq_module_state_buffer.cpp
+++ b/src/lynq/lib/liblynq-network/lynq_module_state_buffer.cpp
@@ -350,7 +350,7 @@
int lynq_set_state_buffer_valid_period_of_network(lynq_network_state_buffer_type type,int valid_period)
{
- if(type>NETWORK_STATE_BUFFER_TYPE_MAX || type <0)
+ if(type>=NETWORK_STATE_BUFFER_TYPE_MAX || type <0)
{
LYERRLOG("%s type %d error",__func__,type);
return -1;
@@ -378,7 +378,7 @@
int lynq_get_state_buffer_valid_period_of_network(lynq_network_state_buffer_type type)
{
- if(type>NETWORK_STATE_BUFFER_TYPE_MAX || type <0)
+ if(type>=NETWORK_STATE_BUFFER_TYPE_MAX || type <0)
{
LYERRLOG("%s type %d error",__func__,type);
return 0;
diff --git a/src/lynq/lib/liblynq-wifi6/libwifi6.c b/src/lynq/lib/liblynq-wifi6/libwifi6.c
index c9efeb6..dac0e29 100755
--- a/src/lynq/lib/liblynq-wifi6/libwifi6.c
+++ b/src/lynq/lib/liblynq-wifi6/libwifi6.c
@@ -4050,6 +4050,7 @@
RLOGD("enter lynq_get_interface_mac\n");
int count;
size_t i;
+ int WIFI_INTERFACE_MAC_LEN = 17;
char *split_words[128] = {0};
const char *lynq_get_mac_cmd = "DRIVER MACADDR";
@@ -4078,7 +4079,7 @@
}
}
- strcpy(mac, split_words[1] + i);
+ strncpy(mac, split_words[1] + i, WIFI_INTERFACE_MAC_LEN);
return 0;
}