git: f2411b1342d8 - stable/13 - LinuxKPI: 802.11: fix ieee80211_add_channel_cbw() argument

From: Bjoern A. Zeeb <bz_at_FreeBSD.org>
Date: Wed, 29 Nov 2023 16:38:52 UTC
The branch stable/13 has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=f2411b1342d8d30d528576e88f441da1cc9d7cb8

commit f2411b1342d8d30d528576e88f441da1cc9d7cb8
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2023-10-26 00:11:43 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2023-11-29 16:36:11 +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
    
    (cherry picked from commit 5856761fd5f675c3871a82effdbf714a1d1bcc5e)
---
 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 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 "