bcm53xx: set WAN MAC address to don't share one with LAN interface

[openwrt/openwrt.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 ad004d792c293b70a4826c5f0906fb384e9e5bcd..fa2837cba2bb20a18889526e6f81a44b920c025b 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,26 +3,70 @@
 # 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
+tenda,ac9)
+       ucidef_add_switch "switch0" \
+               "1:lan" "2:lan" "3:lan" "4:lan" "8@eth0" "0:wan" "5@eth1"
+       board_config_flush
+       exit 0
+       ;;
+buffalo,wxr-1900dhp| \
+buffalo,wzr-1750dhp)
+       ucidef_add_switch "switch0" \
+               "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "4:wan:5" "5@eth0"
+       board_config_flush
+       exit 0
+       ;;
+esac
+
+wan_macaddr="$(nvram get wan_hwaddr)"
 case "$board" in
 asus,rt-ac87u)
        ifname=eth1
+       etXmacaddr=$(nvram get et1macaddr)
        ;;
-netgear,r8000)
+dlink,dir-885l | \
+netgear,r7900 | \
+netgear,r8000 | \
+netgear,r8500)
        ifname=eth2
+       etXmacaddr=$(nvram get et2macaddr)
        ;;
 *)
        ifname=eth0
+       etXmacaddr=$(nvram get et0macaddr)
        ;;
 esac
 
-ucidef_set_interface_loopback
-ucidef_set_interfaces_lan_wan "$ifname.1" "$ifname.2"
-ucidef_add_switch "switch0" "1" "1"
+# If WAN MAC isn't explicitly set, calculate it using base MAC as reference.
+[ -z "$wan_macaddr" -a -n "$etXmacaddr" ] && wan_macaddr=$(macaddr_add "$etXmacaddr" 1)
+
+# Workaround for devices using eth2 connected to (CPU) switch port 8
+case "$board" in
+dlink,dir-885l | \
+netgear,r7900 | \
+netgear,r8000 | \
+netgear,r8500)
+       ifname=eth0
+       ucidef_add_switch "switch0" \
+               "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5t@$ifname"
+
+       # These devices should use eth2 so their eth0 interface often has no MAC
+       # assigned. Manually assign eth2's MAC to the LAN.
+       et2macaddr="$(nvram get et2macaddr)"
+       [ -n "$et2macaddr" ] && ucidef_set_interface_macaddr "lan" "$et2macaddr"
+       [ -n "$wan_macaddr" ] && ucidef_set_interface_macaddr "wan" "$wan_macaddr"
+
+       board_config_flush
+       exit 0
+       ;;
+esac
 
 # NVRAM entries may contain unsorted ports, e.g. Netgear R6250 uses
 # vlan1ports=3 2 1 0 5*
@@ -33,21 +77,23 @@ 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_vlan "switch0" "1" "1 2 3 5 7t"
-       ucidef_add_switch_vlan "switch0" "2" "0 7t"
+       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
 
+[ -n "$wan_macaddr" ] && ucidef_set_interface_macaddr "wan" "$wan_macaddr"
+
 board_config_flush
 
 exit 0