aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-10-06 20:24:05 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-10-06 20:24:05 +0000
commitf24a3a5199d7cce7aec687b0491282f0599f0340 (patch)
tree8228cead6f878ca04cc68dc892b5b7270207ed67
parentdaa77961b639634c2afb560cba883ef8dbfbd590 (diff)
downloadupstream-f24a3a5199d7cce7aec687b0491282f0599f0340.tar.gz
upstream-f24a3a5199d7cce7aec687b0491282f0599f0340.tar.bz2
upstream-f24a3a5199d7cce7aec687b0491282f0599f0340.zip
minor cleanup
SVN-Revision: 4939
-rwxr-xr-xopenwrt/package/base-files/default/lib/network/config.sh7
1 files changed, 2 insertions, 5 deletions
diff --git a/openwrt/package/base-files/default/lib/network/config.sh b/openwrt/package/base-files/default/lib/network/config.sh
index bb58a3e751..3e18db1b43 100755
--- a/openwrt/package/base-files/default/lib/network/config.sh
+++ b/openwrt/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