From 11905af169c1fab7449ab1f8f86bd1c7c48ac411 Mon Sep 17 00:00:00 2001 From: "J. Burfeind" Date: Sun, 10 Jul 2022 23:10:07 +0200 Subject: [PATCH] ath79-generic: (re)add support for UniFi AC Mesh Pro (#2462) Gone due to commit 45c84a117bf8 ("ar71xx: drop target") --- docs/user/supported_devices.rst | 1 + package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces | 1 + package/gluon-core/luasrc/lib/gluon/upgrade/115-swconfig | 1 + package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua | 1 + targets/ath79-generic | 5 +++++ 5 files changed, 9 insertions(+) diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst index b17c7094..feb8a978 100644 --- a/docs/user/supported_devices.rst +++ b/docs/user/supported_devices.rst @@ -115,6 +115,7 @@ ath79-generic - UniFi AC Lite - UniFi AC LR - UniFi AC Mesh + - UniFi AC Mesh Pro - UniFi AC Pro - UniFi AP - UniFi AP LR diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces index 53febdb1..cf21e907 100755 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces @@ -59,6 +59,7 @@ elseif platform.match('ath79', 'generic', { -- Temporary solution to separate interfaces in bridged default setup lan_ifname, wan_ifname = 'eth0', 'eth1' elseif platform.match('ath79', 'generic', { + 'ubnt,unifiac-mesh-pro', 'ubnt,unifiac-pro', }) then lan_ifname, wan_ifname = 'eth0.2', 'eth0.1' diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/115-swconfig b/package/gluon-core/luasrc/lib/gluon/upgrade/115-swconfig index 01cd3811..719d90c0 100755 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/115-swconfig +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/115-swconfig @@ -5,6 +5,7 @@ local uci = require('simple-uci').cursor() local switch_vlans = { -- device identifier, lan ports, wan ports + ["ubnt,unifiac-mesh-pro"] = {"3 0t", "2 0t"}, ["ubnt,unifiac-pro"] = {"2 0t", "3 0t"}, } diff --git a/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua index eb86d914..1d7de7c3 100644 --- a/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua +++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua @@ -44,6 +44,7 @@ function M.is_outdoor_device() 'ubnt,nanostation-m-xw', 'ubnt,unifi-ap-outdoor-plus', 'ubnt,unifiac-mesh', + 'ubnt,unifiac-mesh-pro', }) then return true diff --git a/targets/ath79-generic b/targets/ath79-generic index a56067c3..88ba28eb 100644 --- a/targets/ath79-generic +++ b/targets/ath79-generic @@ -476,6 +476,11 @@ device('ubiquiti-unifi-ac-mesh', 'ubnt_unifiac-mesh', { packages = ATH10K_PACKAGES_QCA9880, }) +device('ubiquiti-unifi-ac-mesh-pro', 'ubnt_unifiac-mesh-pro', { + factory = false, + packages = ATH10K_PACKAGES_QCA9880, +}) + device('ubiquiti-unifi-ac-pro', 'ubnt_unifiac-pro', { factory = false, packages = ATH10K_PACKAGES_QCA9880,