ramips: clean and improve MAC address setup in 02_network

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

diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index e19a618389c7b1ea548bbcbf9630591e61b97240..a6b0177ddeb89fa0a7cdd24f6083ee615b0cee6a 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -513,7 +513,10 @@ ramips_setup_macs()
        alfa-network,w502u|\
        arcwireless,freestation5|\
        cudy,wr1000|\
-       netgear,wnce2001)
+       netgear,wnce2001|\
+       ohyeah,oy-0001|\
+       phicomm,k2g|\
+       skylab,skw92a)
                wan_mac=$(mtd_get_mac_binary factory 0x2e)
                ;;
        arcwireless,freestation5|\
@@ -535,9 +538,12 @@ ramips_setup_macs()
                wan_mac=$(macaddr_add "$lan_mac" 1)
                ;;
        asus,rt-ac57u|\
+       elecom,wrc-1167ghbk2-s|\
+       elecom,wrc-1900gst|\
+       elecom,wrc-2533gst|\
        phicomm,k2p|\
-       planex,vr500)
-               lan_mac=$(mtd_get_mac_binary factory 0xe000)
+       planex,vr500|\
+       samknows,whitebox-v8)
                wan_mac=$(mtd_get_mac_binary factory 0xe006)
                ;;
        asus,rt-n56u)
@@ -557,13 +563,11 @@ ramips_setup_macs()
        buffalo,whr-1166d|\
        buffalo,whr-300hp2|\
        buffalo,whr-600d|\
-       buffalo,wsr-600dhp)
-               wan_mac=$(mtd_get_mac_binary factory 0x4)
-               lan_mac=$wan_mac
-               ;;
        buffalo,whr-g300n|\
-       glinet,gl-mt300n-v2)
-               wan_mac=$(mtd_get_mac_binary factory 0x4)
+       buffalo,wsr-600dhp|\
+       glinet,gl-mt300n-v2|\
+       zyxel,keenetic-start)
+               # This empty case has to be kept for devices without any MAC address adjustments
                ;;
        dlink,dch-m225|\
        samsung,cy-swr1100)
@@ -600,12 +604,6 @@ ramips_setup_macs()
        netgear,r6850)
                wan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 2)
                ;;
-       elecom,wrc-1167ghbk2-s|\
-       elecom,wrc-1900gst|\
-       elecom,wrc-2533gst|\
-       samknows,whitebox-v8)
-               wan_mac=$(mtd_get_mac_binary factory 0xe006)
-               ;;
        hiwifi,hc5661|\
        hiwifi,hc5661a|\
        hiwifi,hc5761|\
@@ -642,14 +640,7 @@ ramips_setup_macs()
                lan_mac=$(mtd_get_mac_binary factory 0x2e)
                ;;
        mercury,mac1200r-v2)
-               lan_mac=$(mtd_get_mac_binary factory_info 0xd)
-               wan_mac=$(macaddr_add "$lan_mac" 1)
-               ;;
-       ohyeah,oy-0001|\
-       phicomm,k2g|\
-       skylab,skw92a)
-               lan_mac=$(mtd_get_mac_binary factory 0x28)
-               wan_mac=$(mtd_get_mac_binary factory 0x2e)
+               wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory_info 0xd)" 1)
                ;;
        poray,m3|\
        poray,m4-4m|\
@@ -662,9 +653,9 @@ ramips_setup_macs()
                wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x8004)" 2)
                ;;
        sparklan,wcr-150gn|\
+       wiznet,wizfi630a|\
        zyxel,keenetic-omni|\
        zyxel,keenetic-omni-ii|\
-       zyxel,keenetic-start|\
        zyxel,keenetic-viva)
                wan_mac=$(mtd_get_mac_binary factory 0x28)
                ;;
@@ -674,10 +665,6 @@ ramips_setup_macs()
        trendnet,tew-691gr)
                wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x4)" 3)
                ;;
-       wiznet,wizfi630a)
-               lan_mac=$(mtd_get_mac_binary factory 0x4)
-               wan_mac=$(mtd_get_mac_binary factory 0x28)
-               ;;
        xiaomi,mir3g|\
        xiaomi,mir3p)
                lan_mac=$(mtd_get_mac_binary factory 0xe006)