[Feature][ZXW-76]merged P48U04 base code
Change-Id: Ia14632a24eb4e8ddf720d8f53f2fe3a1b52a0a8e
diff --git a/ap/app/Script/scripts/internet.sh b/ap/app/Script/scripts/internet.sh
index b9ff044..95a56b4 100755
--- a/ap/app/Script/scripts/internet.sh
+++ b/ap/app/Script/scripts/internet.sh
@@ -9,6 +9,13 @@
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`
@@ -88,17 +95,17 @@
#½«¿ìËÙת·¢¼¶±ð´«¸øÄÚºË
fastnat_level=`nv get fastnat_level`
-echo "Info: set fastnat_level£º$fastnat_level" >> $test_log
+echo "Info: set fastnat_level: $fastnat_level" >> $test_log
echo $fastnat_level > /proc/net/fastnat_level
#½«²»Ö§³Ö¿ìËÙת·¢µÄÐÒé¶Ë¿ÚºÅ´«¸øÄÚºË
nofast_port=`nv get nofast_port`
-echo "Info: set nofast_port£º$nofast_port" >> $test_log
+echo "Info: set nofast_port: $nofast_port" >> $test_log
echo $nofast_port > /proc/net/nofast_port
#SKB debug¿ª¹Ø
skb_debug=`nv get skb_debug`
-echo "Info: set skb_debug£º$skb_debug" >> $test_log
+echo "Info: set skb_debug: $skb_debug" >> $test_log
if [ "-$skb_debug" != "-1" ]; then
echo 0 > /proc/net/skb_debug_off
fi
diff --git a/ap/app/Script/scripts/psext_updown.sh b/ap/app/Script/scripts/psext_updown.sh
index 890a6f1..56f4103 100755
--- a/ap/app/Script/scripts/psext_updown.sh
+++ b/ap/app/Script/scripts/psext_updown.sh
@@ -277,7 +277,7 @@
get_netmask_btrunk $pdp_ip
fi
- ifconfig $ps_if $ps_ip up 2>>$test_log
+ ifconfig $ps_if $ps_ip netmask 255.255.255.0 up 2>>$test_log
if [ $? -ne 0 ];then
echo "Error: ifconfig $ps_if $ps_ip up failed." >> $test_log
fi
diff --git a/ap/app/Script/scripts/wan_ipv4.sh b/ap/app/Script/scripts/wan_ipv4.sh
index e5f7446..e4c5a40 100755
--- a/ap/app/Script/scripts/wan_ipv4.sh
+++ b/ap/app/Script/scripts/wan_ipv4.sh
@@ -113,7 +113,7 @@
if [ $? -ne 0 ];then
echo "Error: ifconfig $wan_if down failed." >> $test_log
fi
- ifconfig $wan_if $pswan_ip up 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