[openwrt/openwrt] mediatek: fix Unifi 6LR network config

LEDE Commits lede-commits at lists.infradead.org
Tue Sep 20 12:11:13 PDT 2022


stintel pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/b472753d79ab014c799f28aac99e698e5caf0b19

commit b472753d79ab014c799f28aac99e698e5caf0b19
Author: Stijn Tintel <stijn at linux-ipv6.be>
AuthorDate: Tue Sep 20 19:27:34 2022 +0300

    mediatek: fix Unifi 6LR network config
    
    When the v1 and v2 variants of the U6LR were introduced, the board
    network config was not adapted to the new device names. Due to this, the
    wrong network config is applied during initial boot. The resulting
    config has lan, wan and a switch, while this device only has a single
    ethernet interface without a switch.
    
    Fix this by using a wildcard that matches all the variants.
    
    Fixes: 15a02471bb85 ("mediatek: new target mt7622-ubnt-unifi-6-lr-v1")
    Fixes: 5c8d3893a78f ("mediatek: new target ubnt_unifi-6-lr-v1-ubootmod")
    Fixes: 31d86a1a1192 ("mediatek: add Ubiquiti UniFi 6 LR v2 targets")
    Signed-off-by: Stijn Tintel <stijn at linux-ipv6.be>
    Acked-by: Daniel Golle <daniel at makrotopia.org>
    (cherry picked from commit 117f41ee95ec445dce5ab9332bc27a6311747c0d)
---
 target/linux/mediatek/mt7622/base-files/etc/board.d/02_network | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network b/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network
index c55fcbee2e..3be9ddd6f7 100644
--- a/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network
@@ -20,8 +20,7 @@ mediatek_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6 at eth0"
 		;;
-	ubnt,unifi-6-lr|\
-	ubnt,unifi-6-lr-ubootmod)
+	ubnt,unifi-6-lr*)
 		ucidef_set_interface_lan "eth0"
 		;;
 	xiaomi,redmi-router-ax6s)




More information about the lede-commits mailing list