pppd: use "atmdev" option to select the DSL adapter, this aligns it with br2684ctl...

SVN-Revision: 23551

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index b893b1ec5239753beab9bca9220e9ca794e3552e..eae32d0439a56c9ff7f8b883371c7f06ce9f096a 100644 (file)
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.4
-PKG_RELEASE:=12
+PKG_RELEASE:=13
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/

diff --git a/package/ppp/files/pppoa.sh b/package/ppp/files/pppoa.sh
index 59e35c2dca558263250082c6628be3337fadb137..df947aa83d3a4ecb654f20c0b7af007a8dab8da2 100644 (file)
--- a/package/ppp/files/pppoa.sh
+++ b/package/ppp/files/pppoa.sh
@@ -9,8 +9,8 @@ stop_interface_pppoa() {
 setup_interface_pppoa() {
        local config="$2"
 
-       local device
-       config_get device "$config" device
+       local atmdev
+       config_get atmdev "$config" atmdev
 
        local vpi
        config_get vpi "$config" vpi
@@ -34,6 +34,6 @@ setup_interface_pppoa() {
        config_get mtu "$config" mtu
 
        start_pppd "$config" \
-               plugin pppoatm.so ${device:+$device.}${vpi:-8}.${vci:-35} \
+               plugin pppoatm.so ${atmdev:+$atmdev.}${vpi:-8}.${vci:-35} \
                ${encaps} ${mtu:+mtu $mtu mru $mtu}
 }