X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=dummy%2Fnetifd-proto.sh;h=b04bc89a4d26d227349594aff8a5fb382863d4a5;hb=0a1b9d266280ceba2492db6287330f771eab9de6;hp=11337c239e0c421337879e92961534f46b68d6f8;hpb=4ff6bcbee05983037f6a629b114beace5d98bdbe;p=project%2Fnetifd.git

diff --git a/dummy/netifd-proto.sh b/dummy/netifd-proto.sh
index 11337c2..b04bc89 100755
--- a/dummy/netifd-proto.sh
+++ b/dummy/netifd-proto.sh
@@ -28,14 +28,14 @@ add_default_handler() {
 
 _proto_do_teardown() {
 	json_load "$data"
-	eval "$1_teardown \"$interface\" \"$ifname\""
+	eval "proto_$1_teardown \"$interface\" \"$ifname\""
 }
 
 _proto_do_setup() {
 	json_load "$data"
 	_EXPORT_VAR=0
 	_EXPORT_VARS=
-	eval "$1_setup \"$interface\" \"$ifname\""
+	eval "proto_$1_setup \"$interface\" \"$ifname\""
 }
 
 proto_init_update() {
@@ -225,16 +225,15 @@ init_proto() {
 				no_device=0
 				available=0
 
-				add_default_handler "$1_init_config"
+				add_default_handler "proto_$1_init_config"
 
 				json_init
 				json_add_string "name" "$1"
-				eval "$1_init"
-				json_add_boolean no-device "$no_device"
-				json_add_boolean available "$available"
 				json_add_array "config"
-				eval "$1_init_config"
+				eval "proto_$1_init_config"
 				json_close_array
+				json_add_boolean no-device "$no_device"
+				json_add_boolean available "$available"
 				json_dump
 			}
 		;;