[Feature][ZXW-65]merged P49 base code

Change-Id: I3e09c0c3d47483bc645f02310380ecb7fc6f4041
diff --git a/ap/app/Script/scripts/psext_up.sh b/ap/app/Script/scripts/psext_up.sh
index 7a51bbf..d0f79aa 100755
--- a/ap/app/Script/scripts/psext_up.sh
+++ b/ap/app/Script/scripts/psext_up.sh
@@ -5,6 +5,7 @@
 fi
 echo "Info: psext_up.sh $1 start" >> $test_log
 path_conf=`nv get path_conf`
+dhcps_in_cap=`nv get dhcps_in_cap`
 
 echo 1 > /proc/sys/net/ipv4/ip_forward
 c_id=$1
@@ -27,12 +28,14 @@
 	if [ $? -ne 0 ];then
 	    echo "Error: ifconfig $eth_br netmask $mask failed." >> $test_log
 	fi
+	if [ "x$dhcps_in_cap" != "x1" ]; then
     if [ -e ${pidfile} ]; then
       kill `cat $pidfile`
 	  rm -f $pidfile
     fi
 	touch $leases
 	udhcpd -f $confile &
+	fi
 }
 
 #»ñÈ¡ip²¢ÅäÖÃps¡¢eth
@@ -41,7 +44,7 @@
     pdp_ip=`nv get $ps_if"_pdp_ip"`
 	ps_ip=`nv get $ps_if"_ip"`
 	br_ip=`nv get $ext_br"_ip"`
-	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