mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
lantiq: move the dsl-modem config to network.@dsl-modem[-1]
make sure uci_defaults generates a proper uci config for the v/adsl modem Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 40439
This commit is contained in:
parent
8bfe9acecf
commit
eebc673f1e
package/network/config
target/linux/lantiq/base-files/etc/uci-defaults
@ -32,8 +32,8 @@ start() {
|
||||
local firmware
|
||||
local xtu
|
||||
config_load network
|
||||
config_get annex wan annex
|
||||
config_get firmware wan firmware
|
||||
config_get annex dsl annex
|
||||
config_get firmware dsl firmware
|
||||
|
||||
eval "xtu=\"\${annex_$annex}\""
|
||||
|
||||
|
@ -134,10 +134,10 @@ start() {
|
||||
local mode
|
||||
|
||||
config_load network
|
||||
config_get tone wan tone
|
||||
config_get annex wan annex
|
||||
config_get firmware wan firmware
|
||||
config_get xfer_mode wan xfer_mode
|
||||
config_get tone dsl tone
|
||||
config_get annex dsl annex
|
||||
config_get firmware dsl firmware
|
||||
config_get xfer_mode dsl xfer_mode
|
||||
|
||||
[ -z "${xfer_mode}" ] && xfer_mode=ptm
|
||||
|
||||
|
@ -28,6 +28,30 @@ set network.wan6.proto='dhcpv6'
|
||||
EOF
|
||||
}
|
||||
|
||||
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'
|
||||
EOF
|
||||
}
|
||||
|
||||
set_vdsl_modem() {
|
||||
local annex=$1
|
||||
local firmware=$2
|
||||
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'
|
||||
EOF
|
||||
}
|
||||
|
||||
. /lib/functions/uci-defaults.sh
|
||||
. /lib/functions/lantiq.sh
|
||||
|
||||
@ -38,6 +62,7 @@ ucidef_set_interface_lan 'eth0'
|
||||
|
||||
vpi=1
|
||||
vci=32
|
||||
annex="a"
|
||||
encaps="llc"
|
||||
payload="bridged"
|
||||
lan_mac=""
|
||||
@ -143,6 +168,13 @@ BTHOMEHUBV2B)
|
||||
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"
|
||||
else
|
||||
set_adsl_modem "$annex" "adsl.bin"
|
||||
fi
|
||||
|
||||
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac
|
||||
[ -n "$wan_mac" ] && ucidef_set_interface_macaddr wan $wan_mac
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user