minor cleanup

SVN-Revision: 4939
2006-10-06 20:24:05 +00:00 · 2006-10-06 20:24:05 +00:00 · f24a3a5199
parent daa77961b6
commit f24a3a5199
1 changed files with 2 additions and 5 deletions
--- 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