From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 24 Aug 2006 12:20:02 +0000 (+0000)
Subject: fix remaining *_ifnames references
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=4092003baf587af80df1b9c6f9dbc49a9dd23483

fix remaining *_ifnames references

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

diff --git a/package/base-files/brcm-2.4/etc/init.d/S05netconfig b/package/base-files/brcm-2.4/etc/init.d/S05netconfig
index a4d29358b..2efd596aa 100755
--- a/package/base-files/brcm-2.4/etc/init.d/S05netconfig
+++ b/package/base-files/brcm-2.4/etc/init.d/S05netconfig
@@ -64,7 +64,7 @@ END {
 	print "#### LAN configuration"
 	print "config interface lan"
 	print "	option type 	bridge"
-	p("ifnames", "lan_ifname")
+	p("ifname", "lan_ifname")
 	print "	option proto	static"
 	print "	option ipaddr	192.168.1.1"
 	print "	option netmask	255.255.255.0"
diff --git a/package/base-files/brcm-2.6/etc/init.d/S05netconfig b/package/base-files/brcm-2.6/etc/init.d/S05netconfig
index a4d29358b..2efd596aa 100755
--- a/package/base-files/brcm-2.6/etc/init.d/S05netconfig
+++ b/package/base-files/brcm-2.6/etc/init.d/S05netconfig
@@ -64,7 +64,7 @@ END {
 	print "#### LAN configuration"
 	print "config interface lan"
 	print "	option type 	bridge"
-	p("ifnames", "lan_ifname")
+	p("ifname", "lan_ifname")
 	print "	option proto	static"
 	print "	option ipaddr	192.168.1.1"
 	print "	option netmask	255.255.255.0"
diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 72146a1d7..8661a2851 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -5,14 +5,11 @@ include network
 addif() {
 	scan_interfaces
 	setup_interface "$INTERFACE"
-	
+
 	# find all vlan configurations for this interface and set them up as well
 	for ifc in $interfaces; do
 		config_get iftype "$ifc" type
-		case "$iftype" in
-			bridge) config_get ifs "$ifc" ifnames;;
-			*) config_get ifs "$ifc" ifname;;
-		esac
+		config_get ifs "$ifc" ifname
 		for dev in $ifs; do
 			[ "${dev%%\.*}" = "$INTERFACE" -a "$dev" != "$INTERFACE" ] && {
 				add_vlan "$dev"
diff --git a/package/base-files/default/sbin/ifup b/package/base-files/default/sbin/ifup
index c40de38ad..86d10d7ca 100755
--- a/package/base-files/default/sbin/ifup
+++ b/package/base-files/default/sbin/ifup
@@ -4,14 +4,7 @@
 . /sbin/ifdown "$@"
 
 config_get iftype "$1" type
-case "$iftype" in
-	bridge)
-		config_get ifname "$1" ifnames
-	;;
-	*)
-		config_get ifname "$1" ifname
-	;;
-esac
+config_get ifname "$1" ifname
 
 for dev in $ifname; do
 	setup_interface "$dev" "$1"