-
Notifications
You must be signed in to change notification settings - Fork 324
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
mac80211: silence mesh rate mismatch warning #3416
Merged
blocktrron
merged 1 commit into
freifunk-gluon:main
from
blocktrron:pr-remove-rate-kernel-log
Jan 8, 2025
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,14 +2,29 @@ From: David Bauer <[email protected]> | |
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 <[email protected]> | ||
|
||
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 <[email protected]> | ||
+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); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it help to use
wiphy_warn_ratelimited
instead?See https://github.com/torvalds/linux/blob/v6.6/include/net/cfg80211.h#L9094-L9097
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Putting the warning in the first place was a bad idea, rate-limiting has no point in that.