ramips: rt305x: merge duplicated mac address setup

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

diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network
index 7e58ef0..65c49e0 100755 (executable)
--- a/target/linux/ramips/base-files/etc/uci-defaults/network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/network
@@ -16,14 +16,26 @@ ramips_setup_interfaces()
        ucidef_set_interface_loopback
 
        case $board in
+       all0256n)
+               ucidef_set_interface_lan "eth0.1"
+               ;;
+
        argus-atp52b | \
        b2c | \
-       f5d8235-v2 | \
        nw718 | \
        w502u)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
                ;;
 
+       f5d8235-v1 | \
+       rt-n15)
+               ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+               ucidef_add_switch "rtl8366s" "1" "1"
+               ucidef_add_switch_vlan "rtl8366s" "1" "1 2 3 4 5t"
+               ucidef_add_switch_vlan "rtl8366s" "2" "0 5t"
+               ;;
+
+       f5d8235-v2 | \
        wl-351)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
                ucidef_add_switch "rtl8366rb" "1" "1"
@@ -31,16 +43,12 @@ ramips_setup_interfaces()
                ucidef_add_switch_vlan "rtl8366rb" "2" "4 5t"
                ;;
 
-       wli-tx4-ag300n)
-               ucidef_set_interface_lan "eth0"
+       wcr-150gn)
+               ucidef_set_interface_lan_wan "eth0.2" "eth0.1"
                ;;
 
-       f5d8235-v1 | \
-       rt-n15)
-               ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-               ucidef_add_switch "rtl8366s" "1" "1"
-               ucidef_add_switch_vlan "rtl8366s" "1" "1 2 3 4 5t"
-               ucidef_add_switch_vlan "rtl8366s" "2" "0 5t"
+       wli-tx4-ag300n)
+               ucidef_set_interface_lan "eth0"
                ;;
 
        *)
@@ -61,9 +69,8 @@ ramips_setup_macs()
        local wan_mac=""
 
        case $board in
-       f5d8235-v2)
-               lan_mac=$(ramips_get_mac_nvram "u-boot" 262148)
-               wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
+       all0256n)
+               lan_mac=$(ramips_get_mac_binary factory 40)
                ;;
 
        argus-atp52b | \
@@ -84,24 +91,35 @@ ramips_setup_macs()
                ;;
 
        esr-9753 | \
-       nbg-419n)
+       nbg-419n | \
+       wcr-150gn)
                 lan_mac=$(ramips_get_mac_binary factory 4)
                 wan_mac=$(ramips_get_mac_binary factory 40)
                ;;
 
+       f5d8235-v2)
+               lan_mac=$(ramips_get_mac_binary "u-boot" 262148)
+               wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
+               ;;
+
        w502u)
                 lan_mac=$(ramips_get_mac_binary factory 40)
                 wan_mac=$(ramips_get_mac_binary factory 46)
                ;;
 
+       wl341v3)
+               lan_mac=$(ramips_get_mac_binary board-nvram 65440)
+               wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
+               ;;
+
        wli-tx4-ag300n)
                lan_mac=$(ramips_get_mac_binary factory 4)
                ;;
 
        esac
 
-       [ -n $lan_mac ] && ucidef_set_interface_macaddr lan $lan_mac
-       [ -n $wan_mac ] && ucidef_set_interface_macaddr wan $wan_mac
+       [ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac
+       [ -n "$wan_mac" ] && ucidef_set_interface_macaddr wan $wan_mac
 }
 
 [ -e /etc/config/network ] && exit 0