From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 6 Oct 2006 20:24:05 +0000 (+0000)
Subject: minor cleanup
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=9e66f218fac49cca73eb3c1d6a9b9d4be67c4f78;p=15.05%2Fopenwrt.git

minor cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4939 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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