aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-08-24 12:20:02 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-08-24 12:20:02 +0000
commitfd33bd769e54fb99093d659bb5803f77ccf8d258 (patch)
tree1e45af7dcadf2285b236e7a325abb7a57bbef206
parent00b6c9992c61c4b0b1103e9952fa468671c89585 (diff)
downloadupstream-fd33bd769e54fb99093d659bb5803f77ccf8d258.tar.gz
upstream-fd33bd769e54fb99093d659bb5803f77ccf8d258.tar.bz2
upstream-fd33bd769e54fb99093d659bb5803f77ccf8d258.zip
fix remaining *_ifnames references
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4650 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/brcm-2.4/etc/init.d/S05netconfig2
-rwxr-xr-xpackage/base-files/brcm-2.6/etc/init.d/S05netconfig2
-rw-r--r--package/base-files/default/etc/hotplug.d/net/10-net7
-rwxr-xr-xpackage/base-files/default/sbin/ifup9
4 files changed, 5 insertions, 15 deletions
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 a4d29358bc..2efd596aa8 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 a4d29358bc..2efd596aa8 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 72146a1d78..8661a2851d 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 c40de38ad8..86d10d7ca3 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"