[openwrt/openwrt] ramips: fix Archer AX23 WiFi MAC address conflict

[LEDE Commits]

blocktrron pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/c1bfb704b1e2e947d62a1a6bb1088570544f5235

commit c1bfb704b1e2e947d62a1a6bb1088570544f5235
Author: David Bauer <mail at david-bauer.net>
AuthorDate: Tue Mar 21 05:07:30 2023 +0100

    ramips: fix Archer AX23  WiFi MAC address conflict
    
    The original claim about conflicting MAC addresses is wrong. mac80211
    does increment the first octet and sets the LA bit.
    
    This means our "workaround" actually leads to the issue while
    incrementing the last octet is safe.
    
    Signed-off-by: David Bauer <mail at david-bauer.net>
    (cherry picked from commit d52870125d57d39e73e6c305dd36fad44fe4a773)
---
 .../ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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 34840c5ba3..d4f259e141 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
@@ -100,10 +100,7 @@ case "$board" in
 		;;
 	tplink,archer-ax23-v1)
 		hw_mac_addr="$(mtd_get_mac_binary config 0x8)"
-		# 2.4 GHz MAC is MAC in EEPROm while 5GHz is EEPROM_MAC -1
-		# However, mac80211 assigns consecutive addresses for each VAP
-		# Which leads to conflicting addresses. Set the LA bit for 5Ghz instead.
-		[ "$PHYNBR" = "1" ] &&  macaddr_setbit_la "$hw_mac_addr" > "/sys${DEVPATH}/macaddress"
+		[ "$PHYNBR" = "1" ] &&  macaddr_add "$hw_mac_addr" -1 > "/sys${DEVPATH}/macaddress"
 		;;
 	tplink,eap615-wall-v1)
 		hw_mac_addr="$(mtd_get_mac_binary product-info 0x8)"