[Feature][ZXW-241]merge P56U01 version
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I7985538dde6951dd824c36149bf9a1e3ca23c734
diff --git a/ap/app/Script/scripts/internet.sh b/ap/app/Script/scripts/internet.sh
index 0726956..71bb90c 100755
--- a/ap/app/Script/scripts/internet.sh
+++ b/ap/app/Script/scripts/internet.sh
@@ -96,6 +96,11 @@
echo "Info: set nofast_port: $nofast_port" >> $test_log
echo $nofast_port > /proc/net/nofast_port
+#½«ÊÇ·ñ¸ù¾ÝRA±¨ÎÄÅäÖÃÍø¿ÚµÄmtu´«¸øÄÚºË
+ra_mtu_enable=`nv get ra_mtu_enable`
+echo "Info: set ra_mtu_enable£º$ra_mtu_enable" >> $test_log
+echo $ra_mtu_enable > /sys/module/psnet_io/parameters/ra_mtu_enable
+
#SKB debug¿ª¹Ø
skb_debug=`nv get skb_debug`
echo "Info: set skb_debug: $skb_debug" >> $test_log
diff --git a/ap/app/Script/scripts/psext_up.sh b/ap/app/Script/scripts/psext_up.sh
index c67e4fe..580ce71 100755
--- a/ap/app/Script/scripts/psext_up.sh
+++ b/ap/app/Script/scripts/psext_up.sh
@@ -88,8 +88,11 @@
fi
}
-mtu=`nv get mtu`
-ifconfig $ps_if mtu $mtu
+ra_mtu_enable=`nv get ra_mtu_enable`
+if [ "$ra_mtu_enable" != "1" ]; then
+ mtu=`nv get mtu`
+ ifconfig $ps_if mtu $mtu
+fi
brctl addbr $ext_br
brctl setfd $ext_br 0.1
brctl addif $ext_br $eth_if
diff --git a/ap/app/Script/scripts/psext_up_ipv6.sh b/ap/app/Script/scripts/psext_up_ipv6.sh
index 5861350..bea9640 100755
--- a/ap/app/Script/scripts/psext_up_ipv6.sh
+++ b/ap/app/Script/scripts/psext_up_ipv6.sh
@@ -120,8 +120,11 @@
fi
}
-mtu=`nv get mtu`
-ifconfig $ps_if mtu $mtu
+ra_mtu_enable=`nv get ra_mtu_enable`
+if [ "$ra_mtu_enable" != "1" ]; then
+ mtu=`nv get mtu`
+ ifconfig $ps_if mtu $mtu
+fi
linkup_get_addr
linkup_route_set
linkup_dhcpv6_set
diff --git a/ap/app/Script/scripts/psext_updown.sh b/ap/app/Script/scripts/psext_updown.sh
index 56f4103..9f74350 100755
--- a/ap/app/Script/scripts/psext_updown.sh
+++ b/ap/app/Script/scripts/psext_updown.sh
@@ -438,8 +438,11 @@
}
if [ "-$1" == "-linkup" ]; then
- mtu=`nv get mtu`
- ifconfig $ps_if mtu $mtu
+ ra_mtu_enable=`nv get ra_mtu_enable`
+ if [ "$ra_mtu_enable" != "1" ]; then
+ mtu=`nv get mtu`
+ ifconfig $ps_if mtu $mtu
+ fi
if [ "-$ps_ext_mode" == "-1" ]; then
brctl addbr $ext_br
brctl setfd $ext_br 0.1
diff --git a/ap/app/Script/scripts/psext_updown_ipv6.sh b/ap/app/Script/scripts/psext_updown_ipv6.sh
index 81be275..83d471c 100755
--- a/ap/app/Script/scripts/psext_updown_ipv6.sh
+++ b/ap/app/Script/scripts/psext_updown_ipv6.sh
@@ -422,8 +422,11 @@
}
if [ "$1" == "linkup" ]; then
- mtu=`nv get mtu`
- ifconfig $ps_if mtu $mtu
+ ra_mtu_enable=`nv get ra_mtu_enable`
+ if [ "$ra_mtu_enable" != "1" ]; then
+ mtu=`nv get mtu`
+ ifconfig $ps_if mtu $mtu
+ fi
if [ "-$ps_ext_mode" == "-1" ]; then
linkup_get_addr
linkup_route_set
diff --git a/ap/app/Script/scripts/wan_ipv4.sh b/ap/app/Script/scripts/wan_ipv4.sh
index 687e65a..e4463a2 100755
--- a/ap/app/Script/scripts/wan_ipv4.sh
+++ b/ap/app/Script/scripts/wan_ipv4.sh
@@ -24,8 +24,11 @@
wan_if=$wifiwan_if ;;
esac
- mtu=`nv get mtu`
- ifconfig $wan_if mtu $mtu
+ ra_mtu_enable=`nv get ra_mtu_enable`
+ if ["$ra_mtu_enable" != "1" -o $1 != "pswan"]; then
+ mtu=`nv get mtu`
+ ifconfig $wan_if mtu $mtu
+ fi
}
#ÉèÖù¤×÷״̬ ÕýÔÚÁ¬½Ó£ºconnect ÒÑÁ¬½Ó£ºworking ÒѶϿª£ºdead
state_set()
@@ -116,11 +119,13 @@
pswan_secdns=`nv get $wan_if"_secdns"`
pswan_nm=`nv get $wan_if"_nm"`
+#xf.li@20240306 modify for [Bugfix][T106BUG-469]Fix the bug of probability datacall fail start
# #ifconfig $wan_if down 2>>$test_log
# ifconfig $wan_if $pswan_ip netmask 255.255.255.0 up 2>>$test_log
# if [ $? -ne 0 ];then
# echo "Error: ifconfig $wan_if $pswan_ip up failed." >> $test_log
# fi
+#xf.li@20240306 modify for [Bugfix][T106BUG-469]Fix the bug of probability datacall fail end
pswan_pri=`nv get pswan_priority`
rt_num=`expr $pswan_pri \* 10 + $c_id`
diff --git a/ap/app/Script/scripts/wan_ipv6.sh b/ap/app/Script/scripts/wan_ipv6.sh
index e1e60d1..3fdcf43 100755
--- a/ap/app/Script/scripts/wan_ipv6.sh
+++ b/ap/app/Script/scripts/wan_ipv6.sh
@@ -41,8 +41,12 @@
"wifiwan")
wan_if=$wifiwan_if ;;
esac
- mtu=`nv get mtu`
- ifconfig $wan_if mtu $mtu
+
+ ra_mtu_enable=`nv get ra_mtu_enable`
+ if ["$ra_mtu_enable" != "1" -o $1 != "pswan"]; then
+ mtu=`nv get mtu`
+ ifconfig $wan_if mtu $mtu
+ fi
#ÐèÒªÓõ½Ïà¹ØÅäÖÃÎļþ
dhcp6s_conf=$path_conf/dhcp6s_$wan_if.conf