[Feature][ZXW-88]merge P50 version
Only Configure: No
Affected branch: master
Affected module: unknown
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I34667719d9e0e7e29e8e4368848601cde0a48408
diff --git a/ap/app/Script/scripts/defwan_set.sh b/ap/app/Script/scripts/defwan_set.sh
old mode 100644
new mode 100755
index 40386c8..6e4e128
--- a/ap/app/Script/scripts/defwan_set.sh
+++ b/ap/app/Script/scripts/defwan_set.sh
@@ -42,9 +42,9 @@
defwan_gw=`nv get $wan_if"_gw"`
if [ "-$defwan_gw" != "-" -o "-$defwan_rel" != "-" ];then
- route add default gw $defwan_gw dev $defwan_rel 2>>$test_log
+ ip route add default via $defwan_gw dev $defwan_rel 2>>$test_log
if [ $? -ne 0 ];then
- echo "Error: route add default gw $defwan_gw dev $defwan_rel failed." >> $test_log
+ echo "Error: ip route add default via $defwan_gw dev $defwan_rel failed." >> $test_log
fi
fi
diff --git a/ap/app/Script/scripts/internet.sh b/ap/app/Script/scripts/internet.sh
index 95a56b4..0726956 100755
--- a/ap/app/Script/scripts/internet.sh
+++ b/ap/app/Script/scripts/internet.sh
@@ -9,13 +9,6 @@
echo "Info: internet.sh start" > $test_log
echo "Info: `date +%m-%d %H:%M:%S`" >> $test_log
-#CONFIG_BRIDGE_IGMP_SNOOPING¿ª¹Ø
-br_multi_off=`nv get br_multi_off`
-echo "Info: set br_multi_off: $br_multi_off" >> $test_log
-if [ "-$br_multi_off" == "-1" ]; then
- echo 1 > /proc/net/br_multi_off
-fi
-
genSysFiles()
{
login=`nv get Login`
diff --git a/ap/app/Script/scripts/psext_up.sh b/ap/app/Script/scripts/psext_up.sh
index d0f79aa..c67e4fe 100755
--- a/ap/app/Script/scripts/psext_up.sh
+++ b/ap/app/Script/scripts/psext_up.sh
@@ -93,7 +93,11 @@
brctl addbr $ext_br
brctl setfd $ext_br 0.1
brctl addif $ext_br $eth_if
+if [ "$eth_if" != "zvnet"$c_id ]; then
ifconfig $ext_br up
+else
+ifconfig $ext_br -arp up
+fi
get_ipaddr
dhcp_set
route_set
diff --git a/ap/app/Script/scripts/psext_up_ipv6.sh b/ap/app/Script/scripts/psext_up_ipv6.sh
index 3432452..71890e0 100755
--- a/ap/app/Script/scripts/psext_up_ipv6.sh
+++ b/ap/app/Script/scripts/psext_up_ipv6.sh
@@ -41,7 +41,11 @@
ip -6 addr add $local_ipv6_addr/64 dev $ps_if 2>>$test_log
brctl addbr $br_if
brctl setfd $br_if 0.1
+ if [ "$eth_if" != "zvnet"$c_id ]; then
ifconfig $br_if up 2>>$test_log
+ else
+ ifconfig $br_if -arp up 2>>$test_log
+ fi
if [ $? -ne 0 ];then
echo "Error: ifconfig $br_if up failed." >> $test_log
fi