layer2interface: adsl and vdsl init scripts are xtmctl version aware

layer2interface/broadcom/etc/init.d/layer2_interface_adsl

@@ -6,6 +6,8 @@ include /lib/network
 START=22
 USE_PROCD=1
 
+XTMCTLVER="$(xtmctl --version 2>&1 | awk '{print$3}')"
+
 checkpvc() {
 	local retur
 	local vpi=$1
@@ -102,9 +104,15 @@ atm_inf_conf() {
 		checkxtmlist $atmtype $pcr $scr $mbs
 		ret="$?"
 		xtmctl operate conn --add 1.$vpi.$vci aal5 $encaps 0 1 $ret
-		xtmctl operate conn --addq 1.$vpi.$vci 0 wrr 1 # low  priority queue
-		xtmctl operate conn --addq 1.$vpi.$vci 1 wrr 1 # mid  priority queue upstream ACK's and ping from LAN will use this queue
-		xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 # high priority queue, internal traffic dhcp igmp dns and icmp
+		if [ "$XTMCTLVER" == "2.5" ]; then
+			xtmctl operate conn --addq 1.$vpi.$vci 0 wrr 1 # low  priority queue
+			xtmctl operate conn --addq 1.$vpi.$vci 1 wrr 1 # mid  priority queue upstream ACK's and ping from LAN will use this queue
+			xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 # high priority queue, internal traffic dhcp igmp dns and icmp
+		else
+			xtmctl operate conn --addq 1.$vpi.$vci 0 wrr 1 dt # low  priority queue
+			xtmctl operate conn --addq 1.$vpi.$vci 1 wrr 1 dt # mid  priority queue upstream ACK's and ping from LAN will use this queue
+			xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 dt # high priority queue, internal traffic dhcp igmp dns and icmp
+		fi
 		xtmctl operate conn --createnetdev 1.$vpi.$vci ${ifname%%.*}
 		xtmctl operate intf --state 1 enable
 

layer2interface/broadcom/etc/init.d/layer2_interface_vdsl

@@ -6,6 +6,8 @@ include /lib/network
 START=22
 USE_PROCD=1
 
+XTMCTLVER="$(xtmctl --version 2>&1 | awk '{print$3}')"
+
 checkptm() {
 	local retur
 	local ptmprio=$1
@@ -44,10 +46,17 @@ ptm_inf_conf() {
 	ret=$?
 
 	if [ "$ret" -eq 0 ]; then
-		xtmctl operate conn --add $dslat.$ptmprio 0 1
-		xtmctl operate conn --addq $dslat.$ptmprio 0 wrr 1 -1 -1 3000 # low  priority queue
-		xtmctl operate conn --addq $dslat.$ptmprio 1 wrr 1 -1 -1 3000 # mid  priority queue upstream ACK's and ping from LAN will use this queue
-		xtmctl operate conn --addq $dslat.$ptmprio 7 wrr 1 -1 -1 3000 # high priority queue, internal traffic dhcp igmp dns and icmp
+		if [ "$XTMCTLVER" == "2.5" ]; then
+			xtmctl operate conn --add $dslat.$ptmprio 0 1
+			xtmctl operate conn --addq $dslat.$ptmprio 0 wrr 1 -1 -1 3000 # low  priority queue
+			xtmctl operate conn --addq $dslat.$ptmprio 1 wrr 1 -1 -1 3000 # mid  priority queue upstream ACK's and ping from LAN will use this queue
+			xtmctl operate conn --addq $dslat.$ptmprio 7 wrr 1 -1 -1 3000 # high priority queue, internal traffic dhcp igmp dns and icmp
+		else
+			xtmctl operate conn --add $dslat.$ptmprio
+			xtmctl operate conn --addq $dslat.$ptmprio 0 wrr 1 dt -1 -1 3000 # low  priority queue
+			xtmctl operate conn --addq $dslat.$ptmprio 1 wrr 1 dt -1 -1 3000 # mid  priority queue upstream ACK's and ping from LAN will use this queue
+			xtmctl operate conn --addq $dslat.$ptmprio 7 wrr 1 dt -1 -1 3000 # high priority queue, internal traffic dhcp igmp dns and icmp
+		fi
 		xtmctl operate conn --createnetdev $dslat.$ptmprio ${ifname%%.*}
 		xtmctl operate intf --state 1 enable
 		xtmctl start
@@ -63,7 +72,11 @@ remove_netdevices() {
 	for i in `xtmctl operate conn --show | grep "PTM\|mode"`
 	do
 		if [ $x -eq 1 ]; then
-			delptm=$(echo $i | awk '{if ($1!="ATM") print $2"."$10}')
+			if [ "$XTMCTLVER" == "2.5" ]; then
+				delptm=$(echo $i | awk '{if ($1!="ATM") print $2"."$10}')
+			else
+				delptm=$(echo $i | awk '{if ($1!="ATM") print $2"."$11}')
+			fi
 			echo "xtmctl operate conn --delete $delptm"
 			xtmctl operate conn --delete $delptm
 			xtmctl operate conn --deletenetdev $delptm