[ltq-dsl] add annex selection support to ltq_dsl package

[openwrt.git] / target / linux / lantiq / base-files / etc / uci-defaults / network

diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/network b/target/linux/lantiq/base-files/etc/uci-defaults/network
index f9a7237..09f6bd7 100755 (executable)
--- a/target/linux/lantiq/base-files/etc/uci-defaults/network
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/network
@@ -52,7 +52,6 @@ set_atm_wan() {
        local vci=$2
        local encaps=$3
        local payload=$4
        local vci=$2
        local encaps=$3
        local payload=$4

-

        uci batch <<EOF
 set network.atm='atm-bridge'
 set network.atm.unit='0'
        uci batch <<EOF
 set network.atm='atm-bridge'
 set network.atm.unit='0'


@@ -60,6 +59,8 @@ set network.atm.vpi='$vpi'
 set network.atm.vci='$vci'
 set network.atm.encaps='$encaps'
 set network.atm.payload='$payload'
 set network.atm.vci='$vci'
 set network.atm.encaps='$encaps'
 set network.atm.payload='$payload'

+set network.atm.fwannex='$annex'
+set network.atm.annex='$annex'

 set network.wan='interface'
 set network.wan.ifname='nas0'
 set network.wan.proto='pppoe'
 set network.wan='interface'
 set network.wan.ifname='nas0'
 set network.wan.proto='pppoe'


@@ -68,6 +69,16 @@ set network.wan.password='bar'
 EOF
 }
 
 EOF
 }
 

+set_adsl() {
+       local fwannex=$1
+       local annex=$2
+       uci batch <<EOF
+set network.adsl='adsl-device'
+set network.adsl.fwannex='$fwannex'
+set network.adsl.annex='$annex'
+EOF
+}
+

 set_interfaces_lan_wan() {
        local lan_ifname=$1
        local wan_ifname=$2
 set_interfaces_lan_wan() {
        local lan_ifname=$1
        local wan_ifname=$2


@@ -109,18 +120,32 @@ touch /etc/config/network
 set_interface_loopback
 set_interface_lan 'eth0'
 
 set_interface_loopback
 set_interface_lan 'eth0'
 

-dsl=$(lantiq_soc_has_adsl)
-[ -z "$dsl" ] || set_atm_wan '1' '32' 'llc' 'bridged'

 
 

-board=$(lantiq_board_name)
+vpi=1
+vci=32
+encaps="llc"
+payload="bridged"
+fwannex=$(lantiq_dsl_fwannex)
+annex="$fwannex"

 
 

+board=$(lantiq_board_name)

 case "$board" in
 case "$board" in

+GIGASX76X)
+       set_interface_lan "eth0.1"
+       add_switch "eth0" "1" "1"
+       add_switch_vlan "eth0" "1" "1 2 3 4 5t"
+       ;;
+

 *)
        # custom foo goes here
        true
        ;;
 esac
 
 *)
        # custom foo goes here
        true
        ;;
 esac
 

+dsl=$(lantiq_soc_has_adsl)
+[ -z "$dsl" ] || set_atm_wan "$vpi" "vci" "$encaps" "$payload" "$annex"
+[ -z "$fwannex" ] || set_adsl "$fwannex" "$annex"
+

 uci commit network
 
 exit 0
 uci commit network
 
 exit 0