bcm53xx: fix regression in generating network config

[openwrt/staging/yousong.git] / target / linux / bcm53xx / base-files / etc / board.d / 02_network

diff --git a/target/linux/bcm53xx/base-files/etc/board.d/02_network b/target/linux/bcm53xx/base-files/etc/board.d/02_network
index 4263615e837c7338f4e6c935d4fd100c907d0043..afb537fbfedf0b4a20317b720464dc6434179bb1 100755 (executable)
--- a/target/linux/bcm53xx/base-files/etc/board.d/02_network
+++ b/target/linux/bcm53xx/base-files/etc/board.d/02_network
@@ -3,13 +3,19 @@
 # Copyright (C) 2011 OpenWrt.org
 #
 
-. /lib/functions/uci-defaults-new.sh
+. /lib/functions/uci-defaults.sh
 
 board_config_update
 
 board=$(cat /proc/device-tree/compatible | tr '\0' '\t' | cut -f 1)
 case "$board" in
-netgear,r8000)
+asus,rt-ac87u)
+       ifname=eth1
+       ;;
+netgear,r7900 | \
+netgear,r8000 | \
+netgear,r8500)
+
        ifname=eth2
        ;;
 *)
@@ -17,9 +23,17 @@ netgear,r8000)
        ;;
 esac
 
-ucidef_set_interface_loopback
-ucidef_set_interfaces_lan_wan "$ifname.1" "$ifname.2"
-ucidef_add_switch "switch0" "1" "1"
+# Workaround for devices using eth2 connected to (CPU) switch port 8
+case "$board" in
+netgear,r7900 | \
+netgear,r8000)
+       ifname=eth0
+       ucidef_add_switch "switch0" \
+               "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5t@$ifname"
+       board_config_flush
+       exit 0
+       ;;
+esac
 
 # NVRAM entries may contain unsorted ports, e.g. Netgear R6250 uses
 # vlan1ports=3 2 1 0 5*
@@ -30,15 +44,19 @@ vlan1ports="$(echo $(nvram get vlan1ports | tr " " "\n" | sort))"
 vlan2ports="$(echo $(nvram get vlan2ports | tr " " "\n" | sort))"
 if echo "$vlan1ports" | egrep -q "^1 2 3 4 5" && \
    echo "$vlan2ports" | egrep -q "^0 5"; then
-       ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t"
-       ucidef_add_switch_vlan "switch0" "2" "0 5t"
+       ucidef_add_switch "switch0" \
+               "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5t@$ifname"
+elif echo "$vlan1ports" | egrep -q "^1 2 3 5 7" && \
+     echo "$vlan2ports" | egrep -q "^0 7"; then
+       ucidef_add_switch "switch0" \
+               "1:lan" "2:lan" "3:lan" "5:lan" "0:wan" "7t@$ifname"
 elif echo "$vlan1ports" | egrep -q "^0 1 2 3 5 7 8" && \
      echo "$vlan2ports" | egrep -q "^4 8"; then
-       ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5 7 8t"
-       ucidef_add_switch_vlan "switch0" "2" "4 8t"
+       ucidef_add_switch "switch0" \
+               "0:lan" "1:lan" "2:lan" "3:lan" "5:lan" "7:lan" "4:wan" "8t@$ifname"
 else
-       ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
-       ucidef_add_switch_vlan "switch0" "2" "4 5t"
+       ucidef_add_switch "switch0" \
+               "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5t@$ifname"
 fi
 
 board_config_flush