summaryrefslogtreecommitdiff
path: root/package/base-files/default/lib
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-06 20:24:05 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-06 20:24:05 +0000
commitcf496205a8d92c574137aad7266207c3e23563d7 (patch)
tree603d7c9670ae9e76f8766060b5adb8812bdc234d /package/base-files/default/lib
parentc1be781808c1d27e2eeb7aff624f286827b29141 (diff)
minor cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4939 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/default/lib')
-rwxr-xr-xpackage/base-files/default/lib/network/config.sh7
1 files changed, 2 insertions, 5 deletions
diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh
index bb58a3e751..3e18db1b43 100755
--- a/package/base-files/default/lib/network/config.sh
+++ b/package/base-files/default/lib/network/config.sh
@@ -59,17 +59,14 @@ add_vlan() {
setup_interface() {
local iface="$1"
local config="$2"
- local proto="$3"
+ local proto
[ -n "$config" ] || {
config=$(find_config "$iface")
[ "$?" = 0 ] || return 1
}
- [ -n "$proto" ] || {
- config_get proto "$config" proto
- }
-
+ proto="${3:-$(config_get "$config" proto)}"
config_get iftype "$config" type
# Setup VLAN interfaces