aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2017-10-14 20:52:22 +0200
committerMathias Kresin <dev@kresin.me>2017-10-25 08:45:05 +0200
commitb02b7004f8d1a946cfd71d2458d5bc3c5946dae7 (patch)
treeeff71676c49592f785648bd97237e4dc6849fd0c /target/linux
parent1470c79cebdae83161a48a5e08c6002ecf090f42 (diff)
downloadupstream-b02b7004f8d1a946cfd71d2458d5bc3c5946dae7.tar.gz
upstream-b02b7004f8d1a946cfd71d2458d5bc3c5946dae7.tar.bz2
upstream-b02b7004f8d1a946cfd71d2458d5bc3c5946dae7.zip
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>
Diffstat (limited to 'target/linux')
-rwxr-xr-xtarget/linux/lantiq/base-files/etc/board.d/01_leds5
-rwxr-xr-xtarget/linux/lantiq/base-files/etc/board.d/02_network4
-rw-r--r--target/linux/lantiq/base-files/etc/uci-defaults/02_migrate_xdsl_iface2
3 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/lantiq/base-files/etc/board.d/01_leds b/target/linux/lantiq/base-files/etc/board.d/01_leds
index 5a692c4fa0..2c7a402dfb 100755
--- a/target/linux/lantiq/base-files/etc/board.d/01_leds
+++ b/target/linux/lantiq/base-files/etc/board.d/01_leds
@@ -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
}
diff --git a/target/linux/lantiq/base-files/etc/board.d/02_network b/target/linux/lantiq/base-files/etc/board.d/02_network
index 8c2a118d96..18d0ba4926 100755
--- a/target/linux/lantiq/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/base-files/etc/board.d/02_network
@@ -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
diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/02_migrate_xdsl_iface b/target/linux/lantiq/base-files/etc/uci-defaults/02_migrate_xdsl_iface
index 1a7cd337e7..292d407c30 100644
--- a/target/linux/lantiq/base-files/etc/uci-defaults/02_migrate_xdsl_iface
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/02_migrate_xdsl_iface
@@ -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