From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 27 Oct 2011 20:28:42 +0000 (+0000)
Subject: netifd: update, prefix proto handler callbacks with 'proto_'
X-Git-Tag: reboot~15755
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bebd9aec71daebe1b11216f39d1f820fcd78af1e;p=openwrt%2Fstaging%2Fblogic.git

netifd: update, prefix proto handler callbacks with 'proto_'

SVN-Revision: 28632
---

diff --git a/package/netifd/Makefile b/package/netifd/Makefile
index a9b6872b1656..3fc309f70275 100644
--- a/package/netifd/Makefile
+++ b/package/netifd/Makefile
@@ -7,7 +7,7 @@ PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://nbd.name/luci2/netifd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=3c1a5bf324c8f2476239c4e49687ca252d3bf4c8
+PKG_SOURCE_VERSION:=24ccfe7d353ceb0ee4f8d4967604585de92fc9d0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 # PKG_MIRROR_MD5SUM:=
 # CMAKE_INSTALL:=1
diff --git a/package/netifd/files/lib/netifd/proto/ppp.sh b/package/netifd/files/lib/netifd/proto/ppp.sh
index 7cff2a98e763..5f549bf6e1d0 100755
--- a/package/netifd/files/lib/netifd/proto/ppp.sh
+++ b/package/netifd/files/lib/netifd/proto/ppp.sh
@@ -90,31 +90,31 @@ ppp_generic_teardown() {
 
 # PPP on serial device
 
-ppp_init_config() {
+proto_ppp_init_config() {
 	proto_config_add_string "device"
 	ppp_generic_init_config
 	no_device=1
 	available=1
 }
 
-ppp_setup() {
+proto_ppp_setup() {
 	local config="$1"
 
 	json_get_var device device
 	ppp_generic_setup "$config" "$device"
 }
 
-ppp_teardown() {
+proto_ppp_teardown() {
 	ppp_generic_teardown "$@"
 }
 
-pppoe_init_config() {
+proto_pppoe_init_config() {
 	ppp_generic_init_config
 	proto_config_add_string "ac"
 	proto_config_add_string "service"
 }
 
-pppoe_setup() {
+proto_pppoe_setup() {
 	local config="$1"
 	local iface="$2"
 
@@ -135,11 +135,11 @@ pppoe_setup() {
 		"nic-$iface"
 }
 
-pppoe_teardown() {
+proto_pppoe_teardown() {
 	ppp_generic_teardown "$@"
 }
 
-pppoa_init_config() {
+proto_pppoa_init_config() {
 	ppp_generic_init_config
 	proto_config_add_int "atmdev"
 	proto_config_add_int "vci"
@@ -147,7 +147,7 @@ pppoa_init_config() {
 	proto_config_add_string "encaps"
 }
 
-pppoa_setup() {
+proto_pppoa_setup() {
 	local config="$1"
 	local iface="$2"
 
@@ -171,7 +171,7 @@ pppoa_setup() {
 		${encaps}
 }
 
-pppoa_teardown() {
+proto_pppoa_teardown() {
 	ppp_generic_teardown "$@"
 }