aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2004-04-14 05:23:42 +0000
committerMike Baker <mbm@openwrt.org>2004-04-14 05:23:42 +0000
commit7c235625b603ae46b6865524f2fab01f9b7c19c7 (patch)
tree5540b5591dbd268939d2bca2cc2ffb092dcbd2f0
parent8cde922064fbc671587a21fb3274e7095b5e8e40 (diff)
downloadupstream-7c235625b603ae46b6865524f2fab01f9b7c19c7.tar.gz
upstream-7c235625b603ae46b6865524f2fab01f9b7c19c7.tar.bz2
upstream-7c235625b603ae46b6865524f2fab01f9b7c19c7.zip
cleanups to allow networking.sh to run on other hardware types (asus)
SVN-Revision: 13
-rwxr-xr-xroot/etc/networking.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/root/etc/networking.sh b/root/etc/networking.sh
index bb85511b83..1a2be2e9d9 100755
--- a/root/etc/networking.sh
+++ b/root/etc/networking.sh
@@ -39,9 +39,9 @@ if_valid () {
wifi_init () {
echo "# --- wifi init ---"
- hwaddr=$(nvram_get il0macaddr)
- [ -z "$hwaddr" ] && hwaddr=$(nvram_get wl0_hwaddr)
- if=$(mac2if $hwaddr)
+ # assume wifi is eth2, fall back to eth1
+ if="eth2"
+ if_valid $if || if="eth1"
$DEBUG wlconf $if up
}
@@ -123,7 +123,8 @@ wifi_init
$DEBUG vconfig set_name_type VLAN_PLUS_VID_NO_PAD
# hacks for 1.x hardware
-[ -z "$(nvram_get vlan0hwname)" ] && {
+[ "$(nvram get boardnum)" = "42" ] && \
+[ "$(nvram get boardtype)" = "bcm94710dev" ] && {
echo "# 1.x HACK"
vlan1hwname="et0"
vlan2hwname="et0"