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

[openwrt-10.03/.git] / target / linux / atheros / base-files / etc / uci-defaults / network

diff --git a/target/linux/atheros/base-files/etc/uci-defaults/network b/target/linux/atheros/base-files/etc/uci-defaults/network
index 68b9a2a27dd24ad9d3452b0a834bff633b480842..af7cfb0afa69c9996ecde4e61b7c3667998dc52f 100644 (file)
--- 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