From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 24 Aug 2009 22:06:56 +0000 (+0000)
Subject: atheros: do not alter the network vlan config if swconfig is required and missing
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=f73661d08150badc0eae94f12ab8901133031113;p=15.05%2Fopenwrt.git

atheros: do not alter the network vlan config if swconfig is required and missing

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17388 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/atheros/base-files/etc/uci-defaults/network b/target/linux/atheros/base-files/etc/uci-defaults/network
index 68b9a2a27d..af7cfb0afa 100644
--- a/target/linux/atheros/base-files/etc/uci-defaults/network
+++ b/target/linux/atheros/base-files/etc/uci-defaults/network
@@ -1,17 +1,5 @@
 #!/bin/sh
-if [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \
-     -e "/sys/bus/mdio_bus/drivers/IC+ IP175C/0:00" -o \
-     -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then
-	uci batch <<EOF
-set network.lan.ifname=eth0.1
-set network.wan=interface
-set network.wan.ifname=eth0.2
-set network.wan.proto=dhcp
-EOF
-	HAS_SWITCH=1
-fi
-
-if [ -e "/sys/bus/mdio_bus/drivers/IC+ IP175C/0:00" ]; then
+if [ -e "/sys/bus/mdio_bus/drivers/IC+ IP175C/0:00" -a -x /sbin/swconfig ]; then
 	uci batch <<EOF
 set network.eth0=switch
 set network.eth0.reset=1
@@ -28,6 +16,18 @@ EOF
 	HAS_SWITCH=1
 fi
 
+if [ -n "$HAS_SWITCH" -o \
+	-e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \
+	-e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then
+	uci batch <<EOF
+set network.lan.ifname=eth0.1
+set network.wan=interface
+set network.wan.ifname=eth0.2
+set network.wan.proto=dhcp
+EOF
+	HAS_SWITCH=1
+fi
+
 [ -z "$HAS_SWITCH" -a -d /sys/class/net/eth1 ] && {
 	uci batch <<EOF
 set network.wan=interface