domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipq806x: ubnt,unifi-ac-hd: reorder eth0 and eth1

Browse Source 
The Ubiquiti UniFi AC HD (UAP-AC-HD, UAP301) has two Ethernet ports,
labeled MAIN and SECONDARY, connected to gmac2 and gmac1, respectively.
The standard probe order results in gmac1/SECONDARY being eth0 and
gmac2/MAIN being eth1. This does not match the stock firmware, is
contrary to user expectation, causes the wrong (high) MAC address to be
used in a bridged configuration (the default for this device), and makes
the gmac2/MAIN port unusable in the preinit environment (such as for
failsafe). Until a recent patch, gmac1/SECONDARY (eth0) was not even
usable.

This reorders the ports so that gmac2/MAIN is eth0, and the now-working
gmac1/SECONDARY is eth1. eth0 has the low MAC address and eth1 has the
high; when bridged, the bridge takes on the correct low MAC address.
This matches the stock firmware. The MAIN port is usable for failsafe
during preinit.

This device does not have a switch on board, so there's no possibility
to remap ports via switch configuration. "ip link set $interface name"
is used instead, during preinit before networking is configured.

Signed-off-by: Mark Mentovai <mark@moxienet.com>
Build-tested: ipq806x/ubnt,unifi-ac-hd
Run-tested: ipq806x/ubnt,unifi-ac-hd
This commit is contained in:
Mark Mentovai
2021-04-12 11:59:20 -04:00
committed by Petr Štetiar
parent 4f74966852
commit 565814a5ee
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
target/linux/ipq806x/base-files/lib/preinit/04_reorder_eth Normal file
View File

@@ -0,0 +1,13 @@
. /lib/functions.sh
preinit_reorder_eth() {
case $(board_name) in
ubnt,unifi-ac-hd)
ip link set eth0 name ethtmp
ip link set eth1 name eth0
ip link set ethtmp name eth1
;;
esac
}
boot_hook_add preinit_main preinit_reorder_eth

4
target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-unifi-ac-hd.dts
View File

@@ -16,8 +16,8 @@
led-running = &led_dome_blue; led-running = &led_dome_blue;
led-upgrade = &led_dome_blue; led-upgrade = &led_dome_blue;
mdio-gpio0 = &mdio0; mdio-gpio0 = &mdio0;
ethernet0 = &gmac1; ethernet0 = &gmac2;
ethernet1 = &gmac2; ethernet1 = &gmac1;
}; };
leds { leds {