The branch main has been updated by bz:
URL:
https://cgit.FreeBSD.org/src/commit/?id=5856761fd5f675c3871a82effdbf714a1d1bcc5e
commit 5856761fd5f675c3871a82effdbf714a1d1bcc5e
Author: Bjoern A. Zeeb <b...@freebsd.org>
AuthorDate: 2023-10-26 00:11:43 +0000
Commit: Bjoern A. Zeeb <b...@freebsd.org>
CommitDate: 2023-11-03 21:08:03 +0000
LinuxKPI: 802.11: fix ieee80211_add_channel_cbw() argument
Fix the last argument passed to ieee80211_add_channel_cbw() in
lkpi_ic_getradiocaps() for both 2Ghz and 5Ghz bands.
We passed in the unmodified version rather than the adjusted version
based on the per-band channel information possibly leaving
ieee80211_channel_flags enabled which should not be.
So far this should not have made a difference given we did not enable
HT or VHT.
Sponsored by: The FreeBSD Foundation
MFC after: 3 days
Reviewed by: cc
Differential Revision: https://reviews.freebsd.org/D42424
---
sys/compat/linuxkpi/common/src/linux_80211.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c
b/sys/compat/linuxkpi/common/src/linux_80211.c
index 3da91fa3e0b7..aba7e0e961a6 100644
--- a/sys/compat/linuxkpi/common/src/linux_80211.c
+++ b/sys/compat/linuxkpi/common/src/linux_80211.c
@@ -3527,7 +3527,7 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan,
error = ieee80211_add_channel_cbw(c, maxchan, n,
channels[i].hw_value, channels[i].center_freq,
channels[i].max_power,
- nflags, bands, chan_flags);
+ nflags, bands, cflags);
/* net80211::ENOBUFS: *n >= maxchans */
if (error != 0 && error != ENOBUFS)
ic_printf(ic, "%s: Adding chan
%u/%u/%#x/%#x/%#x/%#x "
@@ -3597,7 +3597,7 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan,
error = ieee80211_add_channel_cbw(c, maxchan, n,
channels[i].hw_value, channels[i].center_freq,
channels[i].max_power,
- nflags, bands, chan_flags);
+ nflags, bands, cflags);
/* net80211::ENOBUFS: *n >= maxchans */
if (error != 0 && error != ENOBUFS)
ic_printf(ic, "%s: Adding chan
%u/%u/%#x/%#x/%#x/%#x "
