Merge "[Bugfix][T106BUG-520]Fix the problem of not being able to ping ipv4 addresses"
diff --git a/ap/app/Script/scripts/wan_ipv4.sh b/ap/app/Script/scripts/wan_ipv4.sh
index e4463a2..dcbb548 100755
--- a/ap/app/Script/scripts/wan_ipv4.sh
+++ b/ap/app/Script/scripts/wan_ipv4.sh
@@ -241,9 +241,8 @@
#if [ "-$c_id" == "-0" -o "-$c_id" == "-$def_cid" ]; then
#echo 0 > /proc/sys/net/ipv4/ip_forward
#fi
- #xf.li@20240228 delete for T106BUG-520 start
- #ifconfig $wan_if 0.0.0.0 2>>$test_log
- #xf.li@20240228 delete for T106BUG-520 end
+
+ ifconfig $wan_if 0.0.0.0 2>>$test_log
if [ $? -ne 0 ];then
echo "Error: ifconfig $wan_if 0.0.0.0 failed." >> $test_log
fi
diff --git a/ap/app/zte_comm/zte_mainctrl/netdev_proc.c b/ap/app/zte_comm/zte_mainctrl/netdev_proc.c
index 818649d..8ec3e52 100755
--- a/ap/app/zte_comm/zte_mainctrl/netdev_proc.c
+++ b/ap/app/zte_comm/zte_mainctrl/netdev_proc.c
@@ -1142,10 +1142,8 @@
snprintf(cmd, sizeof(cmd),"ifconfig %s down", wan_name);
system_cmd_ex(cmd);
//ifconfig ip
- //xf.li@20240228 delete for T106BUG-520 start
- //snprintf(cmd, sizeof(cmd),"ifconfig %s 0.0.0.0 down", wan_name);
- //system_cmd_ex(cmd);
- //xf.li@20240228 delete for T106BUG-520 end
+ snprintf(cmd, sizeof(cmd),"ifconfig %s 0.0.0.0 down", wan_name);
+ system_cmd_ex(cmd);
sc_cfg_get("default_wan_name", default_wan_name, sizeof(default_wan_name));
sc_cfg_get("default_wan6_name", default_wan6_name, sizeof(default_wan6_name));
diff --git a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/soc/sc/power_4line/hal_xp2xp.c b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/soc/sc/power_4line/hal_xp2xp.c
index 7d19f5c..f2f7cb8 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/soc/sc/power_4line/hal_xp2xp.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/soc/sc/power_4line/hal_xp2xp.c
@@ -179,12 +179,17 @@
/*jb.qi add for dtr on 20240202 start*/
wakeup_irq_occurs = 0;
wait_event_interruptible(wakeup_dtr_wqhead,wakeup_irq_occurs);
- if(!strcmp(attr->name, XP2XP_STATE))
+ if(wakeup_irq_occurs)
{
- sprintf(buf, "%s\n",(g_xp2xp.wake_state == 1 ? "work" : "sleep"));
+ if(!strcmp(attr->name, XP2XP_STATE))
+ {
+ sprintf(buf, "%s\n",(g_xp2xp.wake_state == 1 ? "work" : "sleep"));
+ }
+ return strlen(buf);
}
+
+ return 0;
/*jb.qi add for dtr on 20240202 end*/
- return strlen(buf);
}
ssize_t xp2xp_obj_store(struct kobject *kobject,struct attribute *attr, const char *buf,size_t size)
diff --git a/update_version.sh b/update_version.sh
index 381e04f..342fe63 100755
--- a/update_version.sh
+++ b/update_version.sh
@@ -1,8 +1,8 @@
#!/bin/bash
#export LYNQ_VERSION="T106_lynq_version_ap_build_sh"
-LYNQ_AP_VERSION="T106-V2.01.01.02P54U03.AP.11.02"
-LYNQ_CAP_INSIDE_VERSION="CAP.11.02"
-LYNQ_CAP_VERSION="CAP.11.02"
+LYNQ_AP_VERSION="T106-V2.01.01.02P56U01.AP.12.00"
+LYNQ_CAP_INSIDE_VERSION="CAP.12.00"
+LYNQ_CAP_VERSION="CAP.12.00"
COMMIT_ID="$(git rev-parse HEAD)"
LYNQ_SW_INSIDE_VERSION="LYNQ_CONFIG_VERSION = \"${LYNQ_AP_VERSION}_${LYNQ_CAP_INSIDE_VERSION}\""