aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-10-19 06:42:37 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-10-19 06:42:37 +0000
commit6029e1b618943f601ffa73af95ea37a2875c1006 (patch)
tree6600f603bb1cfdfd84183b4bf2b4b872e9e8b2b1
parent64f992524559dae48b46cc102fb0f5955e238305 (diff)
downloadupstream-6029e1b618943f601ffa73af95ea37a2875c1006.tar.gz
upstream-6029e1b618943f601ffa73af95ea37a2875c1006.tar.bz2
upstream-6029e1b618943f601ffa73af95ea37a2875c1006.zip
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
SVN-Revision: 23530
-rw-r--r--package/ppp/Makefile2
-rw-r--r--package/ppp/files/pppoa.sh10
2 files changed, 7 insertions, 5 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 1e46cdda32..b893b1ec52 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 adbcdf9fbb..59e35c2dca 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}
}