1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-02-25 14:57:56 +02:00

[backfire] merge r23530, r23531, r23551 and r25025

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@25026 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2011-01-17 00:21:35 +00:00
parent 18181c5b06
commit 0f872e4f27
3 changed files with 17 additions and 8 deletions

View File

@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ppp PKG_NAME:=ppp
PKG_VERSION:=2.4.4 PKG_VERSION:=2.4.4
PKG_RELEASE:=11 PKG_RELEASE:=14
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/

View File

@ -10,10 +10,13 @@ if [ "$ACTION" = "add" ]; then
local up local up
config_get_bool up "$ifc" up 0 config_get_bool up "$ifc" up 0
local auto
config_get_bool auto "$ifc" auto 1
local proto local proto
config_get proto "$ifc" proto config_get proto "$ifc" proto
if [ "$proto" = "pppoa" ] && [ "$up" != 1 ]; then if [ "$proto" = "pppoa" ] && [ "$up" != 1 ] && [ "$auto" = 1 ]; then
found=1 found=1
( sleep 1; ifup "$ifc" ) & ( sleep 1; ifup "$ifc" ) &
fi fi

View File

@ -1,13 +1,20 @@
scan_pppoa() {
config_set "$1" device "pppoa-$1"
}
coldplug_interface_pppoa() {
setup_interface_pppoa x "$1"
}
stop_interface_pppoa() { stop_interface_pppoa() {
stop_interface_ppp "$1" stop_interface_ppp "$1"
} }
setup_interface_pppoa() { setup_interface_pppoa() {
local iface="$1"
local config="$2" local config="$2"
local device local atmdev
config_get device "$config" device config_get atmdev "$config" atmdev
local vpi local vpi
config_get vpi "$config" vpi config_get vpi "$config" vpi
@ -29,9 +36,8 @@ setup_interface_pppoa() {
local mtu local mtu
config_get mtu "$config" mtu config_get mtu "$config" mtu
mtu=${mtu:-1500}
start_pppd "$config" \ start_pppd "$config" \
plugin pppoatm.so ${vpi:-8}.${vci:-35} ${encaps} \ plugin pppoatm.so ${atmdev:+$atmdev.}${vpi:-8}.${vci:-35} \
mtu $mtu mru $mtu ${encaps} ${mtu:+mtu $mtu mru $mtu}
} }