diff --git a/target/linux/mediatek/dts/mt7981b-abt-asr3000-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-abt-asr3000-ubootmod.dts index e86c8d38a6..f8b6359d13 100644 --- a/target/linux/mediatek/dts/mt7981b-abt-asr3000-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7981b-abt-asr3000-ubootmod.dts @@ -17,8 +17,8 @@ led-boot = &mesh_led; led-failsafe = &mesh_led; led-upgrade = &mesh_led; - serial0 = &uart0; label-mac-device = &gmac1; + serial0 = &uart0; }; chosen { @@ -42,7 +42,7 @@ label = "mesh"; linux,code = ; linux,input-type = ; - gpios = <&pio 0 GPIO_ACTIVE_HIGH>; + gpios = <&pio 0 GPIO_ACTIVE_LOW>; }; }; @@ -150,7 +150,6 @@ partition@0 { label = "BL2"; reg = <0x00000 0x100000>; - read-only; }; partition@100000 { @@ -180,6 +179,7 @@ factory: partition@280000 { label = "Factory"; reg = <0x280000 0x100000>; + read-only; }; partition@380000 { @@ -202,7 +202,7 @@ port@0 { reg = <0>; - label = "lan1"; + label = "lan3"; }; port@1 { @@ -212,7 +212,7 @@ port@2 { reg = <2>; - label = "lan3"; + label = "lan1"; }; port@6 { diff --git a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac index 2b0b8dc157..8190ea4a7d 100644 --- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac +++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac @@ -11,9 +11,11 @@ board=$(board_name) case "$board" in abt,asr3000-ubootmod) - addr=$(get_mac_label) + # Originally, phy1 is phy0 mac with LA bit set. However, this would conflict + # addresses on multiple VIFs with the other radio. Use label mac to set LA bit. + addr=$(cat /sys/class/net/eth1/address) [ "$PHYNBR" = "0" ] && macaddr_add $addr 1 > /sys${DEVPATH}/macaddress - [ "$PHYNBR" = "1" ] && macaddr_setbit_la $(macaddr_add $addr 1) > /sys${DEVPATH}/macaddress + [ "$PHYNBR" = "1" ] && macaddr_setbit_la $addr > /sys${DEVPATH}/macaddress ;; acer,predator-w6) key_path="/var/qcidata/data"