Skip to content
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: only override advertised basic-rate on 2.4 GHz #3419

Merged

Conversation

blocktrron
Copy link
Member

Previously the basic-rate was set to 1 Mbit/s 802.11b on VIFs which operate on non-g band. This broke meshes on 5 GHz.

@maurerle
Copy link
Member

maurerle commented Jan 9, 2025

I do get ERROR: package/kernel/mac80211 failed to build (build variant: regular) when adding this patch.
Build with V=sc is in progress

error: 'IEEE80211_BAND_2GHZ' undeclared (first use in this function); did you mean 'IEEE80211_CHAN_2GHZ'?
 1090 |         if (sband->band == IEEE80211_BAND_2GHZ) {
      |                            ^~~~~~~~~~~~~~~~~~~
      |                            IEEE80211_CHAN_2GHZ

@blocktrron blocktrron force-pushed the pr-basic-rate-override-24 branch from 9d2cb1a to b8966b0 Compare January 9, 2025 07:39
@maurerle
Copy link
Member

maurerle commented Jan 9, 2025

I still get

build_dir/target-mipsel_24kc_musl/linux-ramips_mt7621/mac80211-regular/backports-6.12.6/net/mac80211/mesh.c:1090:25: error: comparison between 'enum nl80211_band' and 'enum ieee80211_radiotap_channel_flags' [-Werror=enum-compare]
 1090 |         if (sband->band == IEEE80211_CHAN_2GHZ) {
      |                         ^~
cc1: all warnings being treated as errors

Seems like one should rename it to NL80211_BAND_2GHZ instead of IEEE80211_CHAN_2GHZ

@maurerle
Copy link
Member

maurerle commented Jan 9, 2025

Hi @blocktrron, I just tested this patch after s/IEEE80211_BAND_/NL80211_BAND_/ which compiled fine, but has the same behavior as before somehow.
Nodes on v2023.2.3 are seen on the status page, but no link is established in batctl n

@maurerle
Copy link
Member

maurerle commented Jan 9, 2025

I just tested the latest push to pretend BIT(4) | BIT(6) | BIT(8) as basic rate for 5GHz mesh, but unfortunately it did not make a COVR-X1860 on gluon-main see its v2023.2.3 neighbours on the 5GHz wifi again :(

Force backwards-compatible basic-rates on the mesh interface.
This is required to maintain backwards-compatible with older
Gluon releases.

Signed-off-by: David Bauer <[email protected]>
@blocktrron blocktrron force-pushed the pr-basic-rate-override-24 branch from 9de2626 to 00f7355 Compare January 10, 2025 17:35
@blocktrron
Copy link
Member Author

@maurerle should be fixed now.

@maurerle
Copy link
Member

Yes, works fine! Great :)

@blocktrron blocktrron merged commit ab1c311 into freifunk-gluon:main Jan 11, 2025
40 checks passed
@blocktrron blocktrron deleted the pr-basic-rate-override-24 branch January 11, 2025 09:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants