lantiq: more vdsl related cleanups
[openwrt/svn-archive/archive.git] / target / linux / lantiq / base-files / etc / uci-defaults / 02_network
index ac06e5f..02f4f6a 100644 (file)
@@ -32,9 +32,9 @@ set_adsl_modem() {
        local annex=$1
        local firmware=$2
        uci batch <<EOF
-set network.adsl='dsl-modem'
-set network.adsl.annex='$annex'
-set network.adsl.firmware='$firmware'
+set network.dsl='adsl'
+set network.dsl.annex='$annex'
+set network.dsl.firmware='$firmware'
 EOF
 }
 
@@ -44,11 +44,11 @@ set_vdsl_modem() {
        local tone=$3
        local xfer_mode=$4
        uci batch <<EOF
-set network.vdsl='dsl-modem'
-set network.vdsl.annex='$annex'
-set network.vdsl.firmware='$firmware'
-set network.vdsl.tone='$tone'
-set network.vdsl.xfer_mode='$xfer_mode'
+set network.dsl='vdsl'
+set network.dsl.annex='$annex'
+set network.dsl.firmware='$firmware'
+set network.dsl.tone='$tone'
+set network.dsl.xfer_mode='$xfer_mode'
 EOF
 }
 
@@ -170,9 +170,9 @@ esac
 [ -z "$(ls /lib/modules/`uname -r`/ltq_atm*)" ] || set_atm_wan "$vpi" "$vci" "$encaps" "$payload"
 
 if [ -n "$(grep "system type.*: VR9" /proc/cpuinfo)" ]; then
-       set_vdsl_modem "$annex" "vdsl.bin" "bv" "ptm"
+       set_vdsl_modem "$annex" "/lib/firmware/vdsl.bin" "av" "ptm"
 else
-       set_adsl_modem "$annex" "adsl.bin"
+       set_adsl_modem "$annex" "/lib/firmware/adsl.bin"
 fi
 
 [ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac