From a50421a302a4ce94e89c1c90c4ed1521eb36d24f Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 20 Oct 2010 17:56:29 +0000
Subject: [PATCH] pppd: use "atmdev" option to select the DSL adapter, this
aligns it with br2684ctl and solves #8108
SVN-Revision: 23551
---
package/ppp/Makefile | 2 +-
package/ppp/files/pppoa.sh | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index b893b1ec52..eae32d0439 100644
--- 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 59e35c2dca..df947aa83d 100644
--- 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}
}
--
GitLab