From 0b23f899540cdd0104aae99b548850b415f3e609 Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Wed, 8 Jan 2025 16:10:31 +0100
Subject: [PATCH] mac80211: silence mesh rate mismatch warning (#3416)
Printing a warning everytime a rate mismatch is detected is a bit to
much. With many mesh neighbors, this quickly results in the kernel log
being spammed with these messages.
Signed-off-by: David Bauer <mail@david-bauer.net>
---
...de-incompatible-basic-rates-for-mesh.patch | 36 +++++++++++--------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/patches/openwrt/0007-net-mac80211-override-incompatible-basic-rates-for-mesh.patch b/patches/openwrt/0007-net-mac80211-override-incompatible-basic-rates-for-mesh.patch
index cb9bfe8b..f03c2920 100644
--- a/patches/openwrt/0007-net-mac80211-override-incompatible-basic-rates-for-mesh.patch
+++ b/patches/openwrt/0007-net-mac80211-override-incompatible-basic-rates-for-mesh.patch
@@ -2,14 +2,29 @@ From: David Bauer <mail@david-bauer.net>
Date: Mon, 6 Jan 2025 08:30:35 +0100
Subject: net: mac80211: override incompatible basic-rates for mesh
+This is a dirty hack for Gluon.
+
+We assume basic rate setup only affects the rate-controller on the TX
+side. As all devices we support have at least a 802.11n radio and thus
+cover 802.11b as well as 802.11g on 2.4 GHz, they are compatible with
+each other.
+
+As the basic rate was incorrectly set for mesh interfaces in the past,
+connections between mesh neighbors would fail when altering the basic
+rate.
+
+This patch ignores mismatches in the basic-rate field. By doing so, we
+avoid implementing some sort of scheduled switch between wireless
+configurations.
+
Signed-off-by: David Bauer <mail@david-bauer.net>
diff --git a/package/kernel/mac80211/patches/subsys/995-net-mac80211-override-incompatible-basic-rates-for-m.patch b/package/kernel/mac80211/patches/subsys/995-net-mac80211-override-incompatible-basic-rates-for-m.patch
new file mode 100644
-index 0000000000000000000000000000000000000000..19ca64d5012d2974ab2a48e9363ecaa3b60aed4c
+index 0000000000000000000000000000000000000000..efcf0b4f041bb21184e9cd997bc6caca4729a1fe
--- /dev/null
+++ b/package/kernel/mac80211/patches/subsys/995-net-mac80211-override-incompatible-basic-rates-for-m.patch
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,37 @@
+From 091e1eea9e34db7cbf84379021fcbff82887e09a Mon Sep 17 00:00:00 2001
+From: David Bauer <mail@david-bauer.net>
+Date: Mon, 6 Jan 2025 08:23:54 +0100
@@ -35,24 +50,15 @@ index 0000000000000000000000000000000000000000..19ca64d5012d2974ab2a48e9363ecaa3
+ net/mac80211/mesh.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
-+diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
-+index 25223184d6e5..53b5339be5d0 100644
+--- a/net/mac80211/mesh.c
++++ b/net/mac80211/mesh.c
-+@@ -92,8 +92,11 @@ bool mesh_matches_local(struct ieee80211_sub_if_data *sdata,
++@@ -94,9 +94,6 @@ bool mesh_matches_local(struct ieee80211
+ ieee80211_sta_get_rates(sdata, ie, sband->band,
+ &basic_rates);
+
+- if (sdata->vif.bss_conf.basic_rates != basic_rates)
+- return false;
-++ if (sdata->vif.bss_conf.basic_rates != basic_rates) {
-++ wiphy_warn(sdata->wdev.wiphy,
-++ "ignoring basic rate mismatch for peer (local=%x peer=%x)\n",
-++ sdata->vif.bss_conf.basic_rates, basic_rates);
-++ }
-+
-+ cfg80211_chandef_create(&sta_chan_def, sdata->vif.bss_conf.chandef.chan,
++-
++ cfg80211_chandef_create(&sta_chan_def, sdata->vif.bss_conf.chanreq.oper.chan,
+ NL80211_CHAN_NO_HT);
-+--
-+2.45.2
-+
++ ieee80211_chandef_ht_oper(ie->ht_operation, &sta_chan_def);
--
GitLab