From 3c77e53b3f8496c8038f5d7f518451fe7eadd4da Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 4 Aug 2007 13:26:41 +0000
Subject: fix a race condition with dynamic interfaces and firewalling

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8343 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/files/etc/hotplug.d/iface/00-netstate | 3 ---
 package/base-files/files/lib/network/config.sh           | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'package')

diff --git a/package/base-files/files/etc/hotplug.d/iface/00-netstate b/package/base-files/files/etc/hotplug.d/iface/00-netstate
index fce5472cf..6bf621437 100644
--- a/package/base-files/files/etc/hotplug.d/iface/00-netstate
+++ b/package/base-files/files/etc/hotplug.d/iface/00-netstate
@@ -1,6 +1,3 @@
 [ ifup = "$ACTION" ] && {
 	uci set "/var/state/network.$INTERFACE.up=1"
-	[ -z "$DEVICE" ] || {
-		uci set "/var/state/network.$INTERFACE.ifname=$DEVICE"
-	}
 }
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index c384b3e14..3ff65ff8f 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -137,6 +137,7 @@ setup_interface() {
 	config_get mtu "$config" mtu
 	config_get macaddr "$config" macaddr
 	$DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
+	uci set "/var/state/network.$config.ifname=$iface"
 
 	pidfile="/var/run/$iface.pid"
 	case "$proto" in
-- 
cgit v1.2.3