From: David Bauer Date: Tue, 21 Mar 2023 04:07:30 +0000 (+0100) Subject: ramips: fix Archer AX23 WiFi MAC address conflict X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d52870125d57d39e73e6c305dd36fad44fe4a773;p=openwrt%2Fstaging%2Fnbd.git 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 --- 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 ffc643f42b..bf6c55a8fe 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 @@ -149,10 +149,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)"