ipq806x: fix broken WAN on Linksys EAX and Asrock G10

Fix broken WAN on Linksys EAX and Asrock G10 by incrementing the WAN
interface MAC address + 1. This caused conflicting entry in the FDB
table and caused the WAN port to malfunction with the DSA conversion.

Fixes: #17157
Fixes: #15585
Fixes: #16604
Link: https://github.com/openwrt/openwrt/pull/17839
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network
index 77d47b8cd0d1cc53470844d034e847fe295165c0..43ee5ccd14b9c52142e70eeb6d610d576681b281 100644 (file)
--- a/target/linux/ipq806x/base-files/etc/board.d/02_network
+++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
@@ -81,12 +81,12 @@ ipq806x_setup_macs()
                linksys,ea7500-v1)
                        hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr)
                        ucidef_set_interface_macaddr "lan" "$hw_mac_addr"
-                       ucidef_set_interface_macaddr "wan" "$hw_mac_addr"
+                       ucidef_set_interface_macaddr "wan" "$(macaddr_add $hw_mac_addr 1)"
                ;;
                linksys,ea8500)
                        hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr)
                        ucidef_set_interface_macaddr "lan" "$hw_mac_addr"
-                       ucidef_set_interface_macaddr "wan" "$hw_mac_addr"
+                       ucidef_set_interface_macaddr "wan" "$(macaddr_add $hw_mac_addr 1)"
                ;;
                linksys,e8350-v1 |\
                zyxel,nbg6817)
@@ -98,7 +98,7 @@ ipq806x_setup_macs()
                        hw_mac_addr=$(mtd_get_mac_ascii hwconfig HW.LAN.MAC.Address)
                        ucidef_set_interface_macaddr "lan" "$hw_mac_addr"
                        hw_mac_addr=$(mtd_get_mac_ascii hwconfig HW.WAN.MAC.Address)
-                       ucidef_set_interface_macaddr "wan" "$hw_mac_addr"
+                       ucidef_set_interface_macaddr "wan" "$(macaddr_add $hw_mac_addr 1)"
                ;;
        esac
 }