summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-08-02 20:45:52 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-08-02 20:45:52 +0000
commit8eea743a53a2a88c1e5bf34eb1c65a6e1b45526c (patch)
tree18de89527a8eaf05bd7d732ce71a5a8c84b7f365
parent53a9db66e3da4f3d163beb5dc85cd2773c7a2918 (diff)
[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
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 22828f83b..a5bc9ac6f 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"