[openwrt/openwrt] ramips: use hotplug script for EAP615-Wall MACs

[LEDE Commits]

stintel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/ce90ba1f3168e3f4581fd8581e2c0cd31efa14cf

commit ce90ba1f3168e3f4581fd8581e2c0cd31efa14cf
Author: Stijn Tintel <stijn at linux-ipv6.be>
AuthorDate: Tue May 17 17:57:07 2022 +0300

    ramips: use hotplug script for EAP615-Wall MACs
    
    Using nvmem-cells to set the MAC address for a DBDC device results in
    both PHY devices using the same MAC address. This in turn will result in
    multiple BSSes using the same BSSID, which can cause various problems.
    
    Use the hotplug script for the EAP615-Wall instead to avoid this.
    
    Fixes: a1b8a4d7b3ff ("ramips: support TP-Link EAP615-Wall")
    Signed-off-by: Stijn Tintel <stijn at linux-ipv6.be>
    Tested-by: Stijn Segers <foss at volatilesystems.org>
    Tested-By: Andrew Powers-Holmes <aholmes at omnom.net>
---
 target/linux/ramips/dts/mt7621_tplink_eap615-wall-v1.dts              | 2 --
 .../ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac  | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/target/linux/ramips/dts/mt7621_tplink_eap615-wall-v1.dts b/target/linux/ramips/dts/mt7621_tplink_eap615-wall-v1.dts
index a0c3912d8e..0be4af39e8 100644
--- a/target/linux/ramips/dts/mt7621_tplink_eap615-wall-v1.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_eap615-wall-v1.dts
@@ -144,8 +144,6 @@
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
 		mediatek,mtd-eeprom = <&radio 0x0>;
-		nvmem-cells = <&macaddr_info_8>;
-		nvmem-cell-names = "mac-address";
 	};
 };
 
diff --git a/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
index a35e9dcc28..5b12416872 100644
--- a/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
+++ b/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
@@ -90,6 +90,10 @@ case "$board" in
 		hw_mac_addr="$(mtd_get_mac_binary factory 0x4)"
 		[ "$PHYNBR" = "1" ] &&  macaddr_add $hw_mac_addr "0x100000" > /sys${DEVPATH}/macaddress
 		;;
+	tplink,eap615-wall-v1)
+		hw_mac_addr="$(mtd_get_mac_binary product-info 0x8)"
+		macaddr_add "$hw_mac_addr" "$PHYNBR" > "/sys${DEVPATH}/macaddress"
+		;;
 	yuncore,ax820)
 		[ "$PHYNBR" = "1" ] && \
 			macaddr_setbit_la "$(mtd_get_mac_binary Factory 0xe000)" > /sys${DEVPATH}/macaddress