aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern A. Zeeb <bz@FreeBSD.org>2023-10-26 00:11:43 +0000
committerBjoern A. Zeeb <bz@FreeBSD.org>2023-11-29 16:36:11 +0000
commitf2411b1342d8d30d528576e88f441da1cc9d7cb8 (patch)
tree4c93c70ec27ed96e31b689814790ef0eccc1fe6d
parent8a7ba52ba201d9cc62a501feb8da6eb7f1710274 (diff)
downloadsrc-f2411b1342d8d30d528576e88f441da1cc9d7cb8.tar.gz
src-f2411b1342d8d30d528576e88f441da1cc9d7cb8.zip
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 (cherry picked from commit 5856761fd5f675c3871a82effdbf714a1d1bcc5e)
-rw-r--r--sys/compat/linuxkpi/common/src/linux_80211.c4
1 files 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 3f0058d639e1..2292339ef9ba 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 "