2
0
forked from Ivasoft/openwrt

lantiq: xway: rename nas0/ptm0 to dsl0

This change makes it possible to configure the wan/dsl ppp interface
settings independantly from the used TC-Layer (ATM/PTM).

By using dsl0 as interface name as for the xrx200 we can get rid of a
few conditionals which were introduced because of the different default
TC-Layer in xway and xrx200.

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin
2017-10-14 20:52:22 +02:00
parent 1470c79ceb
commit b02b7004f8
5 changed files with 13 additions and 12 deletions

View File

@@ -20,15 +20,12 @@ led_usb2="$(lantiq_get_dt_led usb2)"
led_dsl="$(lantiq_get_dt_led dsl)"
[ -n "$led_dsl" ] && {
interface="nas0"
lantiq_is_vdsl_system && interface="dsl0"
led_internet="$(lantiq_get_dt_led internet)"
if [ -n "$led_internet" ]; then
ucidef_set_led_default "dsl" "dsl" "$led_dsl" "0"
ucidef_set_led_netdev "internet" "internet" "$led_internet" "pppoe-wan"
else
ucidef_set_led_netdev "dsl" "dsl" "$led_dsl" "$interface"
ucidef_set_led_netdev "dsl" "dsl" "$led_dsl" "dsl0"
fi
}

View File

@@ -18,7 +18,7 @@ encaps="llc"
payload="bridged"
lan_mac=""
wan_mac=""
interface_wan=""
interface_wan="dsl0"
board=$(board_name)
@@ -230,10 +230,8 @@ ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \
ucidef_add_atm_bridge "$vpi" "$vci" "$encaps" "$payload"
if lantiq_is_vdsl_system; then
interface_wan="dsl0"
ucidef_add_vdsl_modem "$annex" "$tone" "$xfer_mode"
else
interface_wan="nas0"
ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin"
fi

View File

@@ -40,8 +40,6 @@ migrate_led_xdsl_ifname()
rename_xdsl_ifname system "$1" dev
}
lantiq_is_vdsl_system || exit 0
config_load network
config_foreach migrate_network_xdsl_ifname