ramips: fix Archer AX23 WiFi MAC address conflict
authorDavid Bauer <mail@david-bauer.net>
Tue, 21 Mar 2023 04:07:30 +0000 (05:07 +0100)
committerDavid Bauer <mail@david-bauer.net>
Tue, 21 Mar 2023 04:10:03 +0000 (05:10 +0100)
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@david-bauer.net>
target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac

index ffc643f42b728cced042827d27ae90f3aa21e2fa..bf6c55a8fe0293011476ac8ad45ce8966104d3b1 100644 (file)
@@ -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)"