From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 2 Aug 2010 20:45:52 +0000 (+0000)
Subject: [package] base-files: r22444 caused interfaces to remain down if the macaddr option... 
X-Git-Tag: fast2504n-3.10.28-merged~11398
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=8eea743a53a2a88c1e5bf34eb1c65a6e1b45526c;p=openwrt.git

[package] base-files: r22444 caused interfaces to remain down if the macaddr option is used, fix it. Also localize the txqueuelen option variable


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

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 22828f83bb..a5bc9ac6f2 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -325,12 +325,12 @@ setup_interface() {
 
 	# Interface settings
 	grep "$iface:" /proc/net/dev > /dev/null && {
-		local mtu macaddr
+		local mtu macaddr txqueuelen
 		config_get mtu "$config" mtu
 		config_get macaddr "$config" macaddr
 		config_get txqueuelen "$config" txqueuelen
 		[ -n "$macaddr" ] && $DEBUG ifconfig "$iface" down
-		$DEBUG ifconfig "$iface_main" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} ${txqueuelen:+txqueuelen $txqueuelen} up
+		$DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} ${txqueuelen:+txqueuelen $txqueuelen} up
 	}
 	set_interface_ifname "$config" "$iface"