diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-10-27 20:28:42 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-10-27 20:28:42 +0000 |
| commit | bebd9aec71daebe1b11216f39d1f820fcd78af1e (patch) | |
| tree | 4a86c57a9ab41ba5b5885d6ac27ff65c247635d5 /package/netifd | |
| parent | 24bf5c41a0c7139d765e205f3c827e4f6a2dff11 (diff) | |
| download | upstream-bebd9aec71daebe1b11216f39d1f820fcd78af1e.tar.gz upstream-bebd9aec71daebe1b11216f39d1f820fcd78af1e.tar.bz2 upstream-bebd9aec71daebe1b11216f39d1f820fcd78af1e.zip | |
netifd: update, prefix proto handler callbacks with 'proto_'
SVN-Revision: 28632
Diffstat (limited to 'package/netifd')
| -rw-r--r-- | package/netifd/Makefile | 2 | ||||
| -rwxr-xr-x | package/netifd/files/lib/netifd/proto/ppp.sh | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/package/netifd/Makefile b/package/netifd/Makefile index a9b6872b16..3fc309f702 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 7cff2a98e7..5f549bf6e1 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 "$@" } |