[Feature][ZXW-65]merged P49 base code
Change-Id: I3e09c0c3d47483bc645f02310380ecb7fc6f4041
diff --git a/ap/app/Script/scripts/psext_up_ipv6.sh b/ap/app/Script/scripts/psext_up_ipv6.sh
index 07ef6dc..3432452 100755
--- a/ap/app/Script/scripts/psext_up_ipv6.sh
+++ b/ap/app/Script/scripts/psext_up_ipv6.sh
@@ -23,6 +23,7 @@
ps_ip=`nv get $ps_if"_ipv6_ip"`
pdp_ip=`nv get $ps_if"_ipv6_pdp"`
local_ipv6_addr=`nv get $ps_if"_ipv6_local"`
+dhcps_in_cap=`nv get dhcps_in_cap`
#获取ip并配置ps、eth
linkup_get_addr()
@@ -88,18 +89,23 @@
echo 1 > /proc/sys/net/ipv6/conf/$br_if/accept_ra
#enable ipv6 neigh discovery proxy
echo 1 > /proc/sys/net/ipv6/conf/all/proxy_ndp
-
+ if [ "x$dhcps_in_cap" != "x1" ]; then
zte_ndp -a -s $br_if -d $ps_if -l $ndp_log -p &
+ fi
}
linkup_dhcpv6_set()
{
+ if [ "x$dhcps_in_cap" != "x1" ]; then
dhcp6s -dDf -c $dhcp6s_conf $br_if &
+ fi
}
linkup_radvd_set()
{
+ if [ "x$dhcps_in_cap" != "x1" ]; then
radvd -d 3 -C $radvd_conf -p $radvd_pidfile &
+ fi
}
mtu=`nv get mtu`