From 173a77ce43e4b3382c93c9a86b3947bbc55e8650 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Thu, 7 May 2009 10:34:02 +0000 Subject: [PATCH] merge r14882 to 8.09 (#5703) SVN-Revision: 15659 --- package/ppp/Makefile | 2 +- package/ppp/files/ppp.sh | 2 +- package/ppp/files/pppoa.sh | 2 +- package/ppp/files/pppoe.sh | 2 +- package/pptp/Makefile | 2 +- package/pptp/files/pptp.sh | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 22937683d7..496b0407be 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ppp PKG_VERSION:=2.4.3 -PKG_RELEASE:=10 +PKG_RELEASE:=11 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh index af01d446ce..bfa708dadc 100644 --- a/package/ppp/files/ppp.sh +++ b/package/ppp/files/ppp.sh @@ -77,7 +77,7 @@ setup_interface_ppp() { config_get device "$config" device - config_get mtu "$cfg" mtu + config_get mtu "$config" mtu mtu=${mtu:-1492} start_pppd "$config" \ mtu $mtu mru $mtu \ diff --git a/package/ppp/files/pppoa.sh b/package/ppp/files/pppoa.sh index 8c66250da5..65c5c2db33 100644 --- a/package/ppp/files/pppoa.sh +++ b/package/ppp/files/pppoa.sh @@ -20,7 +20,7 @@ setup_interface_pppoa() { *) ENCAPS="llc-encaps" ;; esac - config_get mtu "$cfg" mtu + config_get mtu "$config" mtu mtu=${mtu:-1500} start_pppd "$config" \ plugin pppoatm.so ${vpi:-8}.${vci:-35} ${ENCAPS} \ diff --git a/package/ppp/files/pppoe.sh b/package/ppp/files/pppoe.sh index e1c9a20cd7..c0bb515162 100644 --- a/package/ppp/files/pppoe.sh +++ b/package/ppp/files/pppoe.sh @@ -15,7 +15,7 @@ setup_interface_pppoe() { config_get ifname "$config" ifname set_interface_ifname "$config" "$ifname" - config_get mtu "$cfg" mtu + config_get mtu "$config" mtu mtu=${mtu:-1492} start_pppd "$config" \ plugin rp-pppoe.so \ diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 1576352362..d41123f587 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pptp PKG_VERSION:=1.6.0 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/pptpclient diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh index ba0e376695..648e0326bc 100644 --- a/package/pptp/files/pptp.sh +++ b/package/pptp/files/pptp.sh @@ -13,7 +13,7 @@ setup_interface_pptp() { config_get device "$config" device config_get ipproto "$config" ipproto - config_get server "$cfg" server + config_get server "$config" server for module in slhc ppp_generic ppp_async ip_gre; do /sbin/insmod $module 2>&- >&- @@ -36,7 +36,7 @@ setup_interface_pptp() { config_get ifname "$config" ifname uci_set_state network "$config" ifname "$ifname" - config_get mtu "$cfg" mtu + config_get mtu "$configg" mtu mtu=${mtu:-1452} start_pppd "$config" \ pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd" \ -- 2.30.2