From nobody Wed Nov 29 16:38:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgQ4r3xn3z52x1X; Wed, 29 Nov 2023 16:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ4r37Qnz3Kxn; Wed, 29 Nov 2023 16:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AeGyxDOfJMvUchqhKDTMOYjlkHeF14KKHImS5eieKKs=; b=jurPaTzh75mHXPiADEqtiGGoyryoqV2L8Pj+eyEyU0NOGXhLtmx2H9r2gDs6CFZQy0Lnrf DIVQGR/ACKq/yk04nxzRt1Dg7EEbfRKybaq8CKw5ee8p+Af4GEymbhwFmTaYFtw4XOuCaz VvSWb0nPyKV6JY6orK4JsB9u6pYbd2dqhI/O1+qLoBjMfFNpJS7hOwnNQYQ9fwC+iQWYOr XjkwxNE2USjRJLty5j/9i5m7qjyZ/ZOEFXqcS/V6R6joMbj/cNbuQdNM/UDYJzS2uKQPxD KqK+Vm8Ymi3fENVChafwmdomL6Wael7DNjclleMho9ahDO8q1phrcUFzXg2/Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AeGyxDOfJMvUchqhKDTMOYjlkHeF14KKHImS5eieKKs=; b=AIvM3mQ9Q8DonNGVAVhzNX/93mYU+rfFOfEiGQ+/IzxDO/UJlACrSip6kaSlG8dfU7SmHR EMN+N1S9YVHRxQ6f3nRPaZEopVq3CjqDYJk1zHdk74JbZe+rzzKvT+dL98IPMrPzM0laCm DCd2PhDD9+fV4a2KEB/2VR4ud8lY6jveqFLPssEDAa0acxGtG30ybqq+TMRUKUL4zG3UXV IxYl4eYTPANPONs+te17xG/FEX5EvqTnUz0anVwC/TkTy7fvxtLr/RR6aXGwpLWNkQDAuB rwkczr4CTpCemCBb4sXkpcxFyh/RyjmSGDB7CutDNjyOEAKvW2liF8egq7iXfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275932; a=rsa-sha256; cv=none; b=Z3xLOovqWZ9LdNG69ZQPdcAfkcQm2bAeyS0FsU1bzazocrDExEUvk/wUYhnpKm5duEUWWl mMMi5lQUNRVXrJWDup5P7Tz8No03iBNeutV0MNwYrkLMEQM6pZpW0ft7xdsMOk8t2zWuFX oScyZG+gbY1qqk4NzoSoyDdu9/V96dRetKsZ4sQLx2KHXiP44hQd54kKl1Ia3Smeo+Fu5g 8kIB5VQhrdr6EAZ72MemTiwbLgtcvf9Xu4b8tulU5qUorkyp1qVQ0XwkRpjFb6uKQkZmBy sOzQvUwE1UOHdGVPiP4RqIBwRZVU8TokrFx5WMu89U9eRJ9Vphm0h1D/vrLVfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgQ4r26svz1CXt; Wed, 29 Nov 2023 16:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGcqc6046994; Wed, 29 Nov 2023 16:38:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcqrb046991; Wed, 29 Nov 2023 16:38:52 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:52 GMT Message-Id: <202311291638.3ATGcqrb046991@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f2411b1342d8 - stable/13 - LinuxKPI: 802.11: fix ieee80211_add_channel_cbw() argument List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f2411b1342d8d30d528576e88f441da1cc9d7cb8 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f2411b1342d8d30d528576e88f441da1cc9d7cb8 commit f2411b1342d8d30d528576e88f441da1cc9d7cb8 Author: Bjoern A. Zeeb AuthorDate: 2023-10-26 00:11:43 +0000 Commit: Bjoern A. Zeeb 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 "