Merge tag 'v2023.2.4' into v2023.2.x-hwtest

Gluon v2023.2.4

README.md

@@ -59,7 +59,7 @@ the future development of Gluon.
 
 Please refrain from using the `master` branch for anything else but development purposes!
 Use the most recent release instead. You can list all releases by running `git tag`
-and switch to one by running `git checkout v2023.2.3 && make update`.
+and switch to one by running `git checkout v2023.2.4 && make update`.
 
 If you're using the autoupdater, do not autoupdate nodes with anything but releases.
 If you upgrade using random master commits the nodes *might break* eventually.

docs/conf.py

@@ -24,7 +24,7 @@
 author = 'Project Gluon'
 
 # The short X.Y version
-version = '2023.2.3'
+version = '2023.2.4'
 # The full version, including alpha/beta/rc tags
 release = version
 

docs/releases/index.rst

@@ -5,6 +5,7 @@ Release Notes
   :caption: Gluon 2023.2
   :maxdepth: 2
 
+  v2023.2.4
   v2023.2.3
   v2023.2.2
   v2023.2.1

docs/releases/v2023.2.4.rst

@@ -0,0 +1,64 @@
+Gluon 2023.2.4
+==============
+
+Added hardware support
+----------------------
+
+ramips-mt7620
+~~~~~~~~~~~~~
+
+- NETGEAR
+
+  - EX6130
+
+
+ramips-mt7621
+~~~~~~~~~~~~~
+
+- Xiaomi
+
+  - Mi Router 4A (Gigabit Edition v2)
+
+
+ramips-mt76x8
+~~~~~~~~~~~~~
+
+- TP-Link
+
+  - RE200 (v4)
+
+
+Bugfixes
+--------
+
+* Fixed an issue where Enterasys WS-AP3710i devices regularly boot with all-zero MAC-addresses in previous releases
+
+* Detection of `swconfig` based switch architecture has been fixed (`#3309 <https://github.com/freifunk-gluon/gluon/pull/3309>`_)
+
+* Fixed an issue where the AVM FRITZ!Box 4040 used an incorrect primary MAC address
+  (`Upstream <https://github.com/openwrt/openwrt/commit/87fbb5085d7e290b0ba536ad7d0876c4224723a6>`_)
+
+
+Known issues
+------------
+
+* Unstable wireless with certain MediaTek devices (`#3154 <https://github.com/freifunk-gluon/gluon/issues/3154>`_)
+
+* The integration of the BATMAN_V routing algorithm is incomplete.
+
+  - Mesh neighbors don't appear on the status page. (`#1726 <https://github.com/freifunk-gluon/gluon/issues/1726>`_)
+    Many tools have the BATMAN_IV metric hardcoded, these need to be updated to account for the new throughput
+    metric.
+  - Throughput values are not correctly acquired for different interface types.
+    (`#1728 <https://github.com/freifunk-gluon/gluon/issues/1728>`_)
+    This affects virtual interface types like bridges and VXLAN.
+
+* Default TX power on many Ubiquiti devices is too high, correct offsets are unknown
+  (`#94 <https://github.com/freifunk-gluon/gluon/issues/94>`_)
+
+  Reducing the TX power in the Advanced Settings is recommended.
+
+* In configurations without VXLAN, the MAC address of the WAN interface is modified even when Mesh-on-WAN is disabled
+  (`#496 <https://github.com/freifunk-gluon/gluon/issues/496>`_)
+
+  This may lead to issues in environments where a fixed MAC address is expected (like VMware when promiscuous mode is disallowed).

docs/site-example/site.conf

@@ -1,4 +1,4 @@
--- This is an example site configuration for Gluon v2023.2.3
+-- This is an example site configuration for Gluon v2023.2.4
 --
 -- Take a look at the documentation located at
 -- https://gluon.readthedocs.io/ for details.

docs/user/getting_started.rst

@@ -8,7 +8,7 @@ Gluon's releases are managed using `Git tags`_. If you are just getting
 started with Gluon we recommend to use the latest stable release of Gluon.
 
 Take a look at the `list of gluon releases`_ and notice the latest release,
-e.g. *v2023.2.3*. Always get Gluon using git and don't try to download it
+e.g. *v2023.2.4*. Always get Gluon using git and don't try to download it
 as a Zip archive as the archive will be missing version information.
 
 Please keep in mind that there is no "default Gluon" build; a site configuration
@@ -29,7 +29,7 @@ freshly installed Debian Bullseye system the following packages are required:
 
 * `git` (to get Gluon and other dependencies)
 * `python3`
-* `python3-distutils`
+* `python3-setuptools`
 * `build-essential`
 * `ecdsautils` (to sign firmware, see `contrib/sign.sh`)
 * `gawk`
@@ -53,7 +53,7 @@ Building the images
 -------------------
 
 To build Gluon, first check out the repository. Replace *RELEASE* with the
-version you'd like to checkout, e.g. *v2023.2.3*.
+version you'd like to checkout, e.g. *v2023.2.4*.
 
 ::
 

docs/user/supported_devices.rst

@@ -395,6 +395,7 @@ ramips-mt7620
 
   - EX3700
   - EX3800
+  - EX6130
 
 * Nexx
 
@@ -466,7 +467,7 @@ ramips-mt7621
 * Xiaomi
 
   - Xiaomi Mi Router 3G (v1, v2)
-  - Xiaomi Mi Router 4A (Gigabit Edition v1)
+  - Xiaomi Mi Router 4A (Gigabit Edition v1, v2)
 
 * ZBT
 
@@ -504,7 +505,7 @@ ramips-mt76x8
 
   - Archer C20 (v4, v5)
   - Archer C50 (v3, v4)
-  - RE200 (v2, v3)
+  - RE200 (v2, v3, v4)
   - TL-MR3020 (v3)
   - TL-MR3420 (v5)
   - TL-MR6400 (v5)

modules

@@ -2,15 +2,15 @@ GLUON_FEEDS='gluon packages routing'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-23.05
-OPENWRT_COMMIT=3001d3c5d446bf53fc222640d49a4cc79e04a2f3
+OPENWRT_COMMIT=533235182141392d8031a6d2edb9d7edc91bfd5a
 
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_COMMIT=3d08b0fee8dc5d96d8bcdb985fad1d5564de4022
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-23.05
-PACKAGES_PACKAGES_COMMIT=6be3892dc1abb7b39c2af0123a52335ef0b8a679
+PACKAGES_PACKAGES_COMMIT=33858483a03f322ec1233a98816c3d3197c177dd
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
 PACKAGES_ROUTING_BRANCH=openwrt-23.05
-PACKAGES_ROUTING_COMMIT=a82e34d5e402ec77fd5facc1349352cacda2d0f8
+PACKAGES_ROUTING_COMMIT=e351d1e623e9ef2ab78f28cb1ce8d271d28c902d

package/gluon-core/luasrc/usr/lib/lua/gluon/ethernet.lua

@@ -16,11 +16,11 @@ end
 local function is_swconfig()
 	local has = false
 
-	uci:foreach("system", "switch", function()
+	uci:foreach("network", "switch", function()
 		has = true
 	end)
 
-	uci:foreach("system", "switch_vlan", function()
+	uci:foreach("network", "switch_vlan", function()
 		has = true
 	end)
 

patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch

@@ -174,10 +174,10 @@ index 0000000000000000000000000000000000000000..077a563b6066cd1d3aee4b1e82328e8c
 + 
 + int system_bridge_addif(struct device *bridge, struct device *dev)
 diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
-index 377553433846b5cec34e5d7036b8109f954aef5a..47c2ca0409654b4bfa08f32ed2869a6d077c8913 100644
+index 4b059cb53f4fe1b7132675d15b66a175a0d44a60..ed36acdb8dc055bef60709191ad0950520f9cb57 100644
 --- a/target/linux/generic/config-5.15
 +++ b/target/linux/generic/config-5.15
-@@ -761,6 +761,7 @@ CONFIG_BRIDGE=y
+@@ -762,6 +762,7 @@ CONFIG_BRIDGE=y
  # CONFIG_BRIDGE_EBT_T_NAT is not set
  # CONFIG_BRIDGE_EBT_VLAN is not set
  CONFIG_BRIDGE_IGMP_SNOOPING=y

patches/openwrt/0009-mac80211-Increase-default-distance-setting.patch

@@ -7,10 +7,10 @@ Signed-off-by: Sven Eckelmann <[email protected]>
 Forwarded: no
 
 diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
-index 6a37cbb22ea3983f0ad1085f1a7e9ec25d62f786..bf0e505d4f8c699fc1bfb7454192fbfe363a9d43 100644
+index a80d106afa5250981b8e2bfe92103ed2cbd97b7b..7507db5a73afcbc09b43a848b1e3968041ea2ac3 100644
 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
 +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
-@@ -1098,7 +1098,7 @@ drv_mac80211_setup() {
+@@ -1099,7 +1099,7 @@ drv_mac80211_setup() {
 
  	set_default rxantenna 0xffffffff
  	set_default txantenna 0xffffffff

patches/openwrt/0010-ath9k-work-around-AR_CFG-0xdeadbeef-chip-hang.patch

@@ -40,19 +40,17 @@ index 0000000000000000000000000000000000000000..146d0a9cf8ada26a6ff7d3ed32b4041f
 + 
 diff --git a/package/kernel/mac80211/patches/ath/951-Revert-354-ath9k-rename-tx_complete_work-to-hw_check.patch b/package/kernel/mac80211/patches/ath/951-Revert-354-ath9k-rename-tx_complete_work-to-hw_check.patch
 new file mode 100644
-index 0000000000000000000000000000000000000000..d36920144cdd7a43ff91efc556602f9cf3d42c1c
+index 0000000000000000000000000000000000000000..e9f45c7398c8be5241e15e848d540146756b7668
 --- /dev/null
 +++ b/package/kernel/mac80211/patches/ath/951-Revert-354-ath9k-rename-tx_complete_work-to-hw_check.patch
-@@ -0,0 +1,178 @@
+@@ -0,0 +1,168 @@
 +From: Sven Eckelmann <[email protected]>
 +Date: Thu, 23 Apr 2020 18:44:45 +0200
 +Subject: Revert 354-ath9k-rename-tx_complete_work-to-hw_check.patch
 +
-+diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
-+index 15ea905a52192b7d97e0962331282bb319dd267e..e38065b2e79f3df92c4679c310a1de871134460f 100644
 +--- a/drivers/net/wireless/ath/ath9k/ath9k.h
 ++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-+@@ -110,7 +110,7 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
++@@ -108,7 +108,7 @@ int ath_descdma_setup(struct ath_softc *
 + #define ATH_AGGR_MIN_QDEPTH        2
 + /* minimum h/w qdepth for non-aggregated traffic */
 + #define ATH_NON_AGGR_MIN_QDEPTH    8
@@ -61,7 +59,7 @@ index 0000000000000000000000000000000000000000..d36920144cdd7a43ff91efc556602f9c
 + #define ATH_TXFIFO_DEPTH           8
 + #define ATH_TX_ERROR               0x01
 + 
-+@@ -747,7 +747,7 @@ void ath9k_csa_update(struct ath_softc *sc);
++@@ -738,7 +738,7 @@ void ath9k_csa_update(struct ath_softc *
 + #define ATH_PAPRD_TIMEOUT         100 /* msecs */
 + #define ATH_PLL_WORK_INTERVAL     100
 + 
@@ -70,7 +68,7 @@ index 0000000000000000000000000000000000000000..d36920144cdd7a43ff91efc556602f9c
 + void ath_reset_work(struct work_struct *work);
 + bool ath_hw_check(struct ath_softc *sc);
 + void ath_hw_pll_work(struct work_struct *work);
-+@@ -1080,7 +1080,7 @@ struct ath_softc {
++@@ -1040,7 +1040,7 @@ struct ath_softc {
 + #ifdef CPTCFG_ATH9K_DEBUGFS
 + 	struct ath9k_debug debug;
 + #endif
@@ -79,20 +77,16 @@ index 0000000000000000000000000000000000000000..d36920144cdd7a43ff91efc556602f9c
 + 	struct delayed_work hw_pll_work;
 + 	struct timer_list sleep_timer;
 + 
-+diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
-+index 97f8fc6448f8de692cf2e3eccd77c35a03e3f958..67b4457d0019325ca4919e96d5a5820b357cd9cc 100644
 +--- a/drivers/net/wireless/ath/ath9k/init.c
 ++++ b/drivers/net/wireless/ath/ath9k/init.c
-+@@ -744,7 +744,6 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
++@@ -787,7 +787,6 @@ static int ath9k_init_softc(u16 devid, s
 + 	INIT_WORK(&sc->hw_reset_work, ath_reset_work);
 + 	INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
 + 	INIT_DELAYED_WORK(&sc->hw_pll_work, ath_hw_pll_work);
 +-	INIT_DELAYED_WORK(&sc->hw_check_work, ath_hw_check_work);
 + 
 + 	ath9k_init_channel_context(sc);
 + 
-+diff --git a/drivers/net/wireless/ath/ath9k/link.c b/drivers/net/wireless/ath/ath9k/link.c
-+index 9d84003db800e9513f07ee85a4203dbb7636edf0..321136767c99951682374a632f94476089d57219 100644
 +--- a/drivers/net/wireless/ath/ath9k/link.c
 ++++ b/drivers/net/wireless/ath/ath9k/link.c
 +@@ -20,13 +20,20 @@
@@ -107,10 +101,10 @@ index 0000000000000000000000000000000000000000..d36920144cdd7a43ff91efc556602f9c
 + 	struct ath_txq *txq;
 + 	int i;
 ++	bool needreset = false;
+++
 + 
 +-	if (sc->tx99_state)
 +-		return true;
-++
 ++	if (sc->tx99_state) {
 ++		ath_dbg(ath9k_hw_common(sc->sc_ah), RESET,
 ++			"skip tx hung detection on tx99\n");
@@ -119,7 +113,7 @@ index 0000000000000000000000000000000000000000..d36920144cdd7a43ff91efc556602f9c
 + 
 + 	for (i = 0; i < IEEE80211_NUM_ACS; i++) {
 + 		txq = sc->tx.txq_map[i];
-+@@ -34,36 +41,25 @@ static bool ath_tx_complete_check(struct ath_softc *sc)
++@@ -34,36 +41,25 @@ static bool ath_tx_complete_check(struct
 + 		ath_txq_lock(sc, txq);
 + 		if (txq->axq_depth) {
 + 			if (txq->axq_tx_inprogress) {
@@ -167,11 +161,9 @@ index 0000000000000000000000000000000000000000..d36920144cdd7a43ff91efc556602f9c
 + }
 + 
 + /*
-+diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
-+index 434fb92f31b2b0a6803884de785133824225111a..49c07032e15a041c58b4467c09f470545ffe5bb0 100644
 +--- a/drivers/net/wireless/ath/ath9k/main.c
 ++++ b/drivers/net/wireless/ath/ath9k/main.c
-+@@ -184,7 +184,7 @@ void ath9k_ps_restore(struct ath_softc *sc)
++@@ -184,7 +184,7 @@ void ath9k_ps_restore(struct ath_softc *
 + static void __ath_cancel_work(struct ath_softc *sc)
 + {
 + 	cancel_work_sync(&sc->paprd_work);
@@ -180,17 +172,17 @@ index 0000000000000000000000000000000000000000..d36920144cdd7a43ff91efc556602f9c
 + 	cancel_delayed_work_sync(&sc->hw_pll_work);
 + 
 + #ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
-+@@ -201,8 +201,7 @@ void ath_cancel_work(struct ath_softc *sc)
++@@ -201,8 +201,7 @@ void ath_cancel_work(struct ath_softc *s
 + 
 + void ath_restart_work(struct ath_softc *sc)
 + {
 +-	ieee80211_queue_delayed_work(sc->hw, &sc->hw_check_work,
-+-				     ATH_HW_CHECK_POLL_INT);
++-				     msecs_to_jiffies(ATH_HW_CHECK_POLL_INT));
 ++	ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
 + 
 + 	if (AR_SREV_9340(sc->sc_ah) || AR_SREV_9330(sc->sc_ah))
 + 		ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work,
-+@@ -2102,7 +2101,7 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop,
++@@ -2200,7 +2199,7 @@ void __ath9k_flush(struct ieee80211_hw *
 + 	int timeout;
 + 	bool drain_txq;
 + 
@@ -199,21 +191,19 @@ index 0000000000000000000000000000000000000000..d36920144cdd7a43ff91efc556602f9c
 + 
 + 	if (ah->ah_flags & AH_UNPLUGGED) {
 + 		ath_dbg(common, ANY, "Device has been unplugged!\n");
-+@@ -2140,8 +2139,7 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop,
++@@ -2238,8 +2237,7 @@ void __ath9k_flush(struct ieee80211_hw *
 + 		ath9k_ps_restore(sc);
 + 	}
 + 
 +-	ieee80211_queue_delayed_work(hw, &sc->hw_check_work,
-+-				     ATH_HW_CHECK_POLL_INT);
++-				     msecs_to_jiffies(ATH_HW_CHECK_POLL_INT));
 ++	ieee80211_queue_delayed_work(hw, &sc->tx_complete_work, 0);
 + }
 + 
 + static bool ath9k_tx_frames_pending(struct ieee80211_hw *hw)
-+diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
-+index a1a516407a60d75b03772c1853c88b678f935344..21fc71dce8fa0bde8793eb50f2161703256d087b 100644
 +--- a/drivers/net/wireless/ath/ath9k/xmit.c
 ++++ b/drivers/net/wireless/ath/ath9k/xmit.c
-+@@ -2876,6 +2876,8 @@ int ath_tx_init(struct ath_softc *sc, int nbufs)
++@@ -2837,6 +2837,8 @@ int ath_tx_init(struct ath_softc *sc, in
 + 		return error;
 + 	}
 + 

targets/ath79-generic

@@ -383,6 +383,12 @@ device('siemens-ws-ap3610', 'siemens_ws-ap3610', {
 
 -- Sophos
 
+device('sophos-ap15', 'sophos_ap15', {
+	packages = ATH10K_PACKAGES_QCA9880,
+	factory = false,
+	broken = true, -- no button and no external console port
+})
+
 device('sophos-ap100', 'sophos_ap100', {
 	packages = ATH10K_PACKAGES_QCA9880,
 	factory = false,

targets/ramips-mt7620

@@ -29,6 +29,11 @@ device('netgear-ex3700', 'netgear_ex3700', {
 	factory_ext = '.chk',
 })
 
+device('netgear-ex6130', 'netgear_ex6130', {
+	factory_ext = '.chk',
+})
+
+
 -- Nexx
 
 device('nexx-wt3020-8m', 'nexx_wt3020-8m', {

targets/ramips-mt7621

@@ -120,6 +120,10 @@ device('xiaomi-mi-router-4a-gigabit-edition', 'xiaomi_mi-router-4a-gigabit', {
 	factory = false,
 })
 
+device('xiaomi-mi-router-4a-gigabit-edition-v2', 'xiaomi_mi-router-4a-gigabit-v2', {
+	factory = false,
+})
+
 device('xiaomi-mi-router-3g', 'xiaomi_mi-router-3g', {
 	factory = false,
 })

targets/ramips-mt76x8

@@ -62,6 +62,8 @@ device('tp-link-re200-v2', 'tplink_re200-v2')
 
 device('tp-link-re200-v3', 'tplink_re200-v3')
 
+device('tp-link-re200-v4', 'tplink_re200-v4')
+
 device('tp-link-tl-mr3020-v3', 'tplink_tl-mr3020-v3', {
 	factory = false,
 	extra_images = {