From 27ff368270555c56478cca1ac22b817108c2a492 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 19 Oct 2010 06:42:37 +0000
Subject: [package] ppp: 	- implement coldplugging for pppoa interfaces 
 - honour device option to select the DSL adapter 	- don't set any
 default mtu, rely on pppd to negotiate it 	- bump pkg revision

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23530 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/ppp/Makefile       |  2 +-
 package/ppp/files/pppoa.sh | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'package')

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 1e46cdda3..b893b1ec5 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:=11
+PKG_RELEASE:=12
 
 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 adbcdf9fb..59e35c2dc 100644
--- a/package/ppp/files/pppoa.sh
+++ b/package/ppp/files/pppoa.sh
@@ -1,9 +1,12 @@
+coldplug_interface_pppoa() {
+	setup_interface_pppoa x "$1"
+}
+
 stop_interface_pppoa() {
 	stop_interface_ppp "$1"
 }
 
 setup_interface_pppoa() {
-	local iface="$1"
 	local config="$2"
 
 	local device
@@ -29,9 +32,8 @@ setup_interface_pppoa() {
 
 	local mtu
 	config_get mtu "$config" mtu
-	mtu=${mtu:-1500}
 
 	start_pppd "$config" \
-		plugin pppoatm.so ${vpi:-8}.${vci:-35} ${encaps} \
-		mtu $mtu mru $mtu
+		plugin pppoatm.so ${device:+$device.}${vpi:-8}.${vci:-35} \
+		${encaps} ${mtu:+mtu $mtu mru $mtu}
 }
-- 
cgit v1.2.3