From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 31 Dec 2013 13:09:20 +0000 (+0000)
Subject: netifd: initialize the switch early at start time and on reload (fixes #13015)
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=3328763a8d0abbcbcf79b5a91e6abbb0b55b3119;p=openwrt.git

netifd: initialize the switch early at start time and on reload (fixes #13015)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39183 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/network/config/netifd/files/etc/init.d/network b/package/network/config/netifd/files/etc/init.d/network
index bc03783eb5..e117463ad1 100755
--- a/package/network/config/netifd/files/etc/init.d/network
+++ b/package/network/config/netifd/files/etc/init.d/network
@@ -5,7 +5,16 @@ STOP=90
 
 USE_PROCD=1
 
+init_switch() {
+	setup_switch() { return 0; }
+
+	include /lib/network
+	setup_switch
+}
+
 start_service() {
+	init_switch
+
 	procd_open_instance
 	procd_set_param command /sbin/netifd
 	procd_set_param respawn
@@ -17,6 +26,7 @@ start_service() {
 }
 
 reload_service() {
+	init_switch
 	ubus call network reload
 	/sbin/wifi reload_legacy
 }
@@ -26,13 +36,7 @@ stop_service() {
 }
 
 service_running() {
-	setup_switch() { return 0; }
-
-	include /lib/network
-	setup_switch
-
 	sleep 5
-
 	/sbin/wifi reload_legacy
 }