From nobody Thu Nov 30 00:38:18 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 4Sgck235gTz52V1q; Thu, 30 Nov 2023 00:38:18 +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 4Sgck229DMz3Mpy; Thu, 30 Nov 2023 00:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304698; 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=upZKYeiF/hDzV0NsgYg/SP7zblw5BDOxXg+Qr2VuwDo=; b=kxtp/t3U8t8QDNZo+8mxukFMjfIcsrWzWhMLCHoZFrIUKGjdOykvmhcboqXVMiOGny0PCr Yk4KIHvKPugIofmhUKxLuT02VJR/UMRyoCUlJgY0CJO96dRg+5S4577IQMMzfZWp/ql2nI UUgJ+FjKr08NJ89k/Xo5qEW2HCbq/CsEJmGOSNCDNerXeveoCvOm8XSs9JVdbl8zseyEpT 44ksCBlfLQI3iEjdeaHPa4pJ28WnBKpWSpeoZhwAeosAe1Y0Dy2BbPs0DXOLzogWG9CcDT WZ7qS2esA2bBGb+OaLmBlQFg7EcCX+4+4/Y21NHLZQkRYIwI3DAGJhuMvy2t5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304698; 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=upZKYeiF/hDzV0NsgYg/SP7zblw5BDOxXg+Qr2VuwDo=; b=nAxonruITItjSeSf9e7uH0u1ChElhI3XFUGVvXN4bUm0Q3Qs89loaOoFZA8y7xDXqZm583 Tq+u4qoippJv1H2sym2J7/QzG0hFEqgp0bz2fSOwb2mi8Rt5elH2NJcHO66NqC4YMYnLrT 5PGi08004u9U0H8NqER8HEbPkpNvuK1ycm/b/+BbRASAXlLdL7TaruMt3oe3jHHCp+s52Z mNGiwCta8co1i5Uys6uS/6HSOuaCukVfwu767MzvIggFHTDi0tKhWakd6xso/bv1gQb7/S NadyiMqVKeMWttC3SmAMqoQtq5OUjLoH4Dafb34yoCJCOBydbQfjgSUQPxIp0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304698; a=rsa-sha256; cv=none; b=WTtuaY/LaA+smjBhcR9oUQ/NCBZ6z/OgsQNYq3bLdj6yyasZ0AGsF9odn3P6wtTw3BapkC 8ejfHPKEjS3osGj98BaRVNpW6MyfO5okbAGaQcN48pVILKccz/RxBk+xzK6EKYcGUfd0Bt z7BPawn3GzqNeE3raWgxluHB2Q++5EAARcMFNqPIsoSxLQGw8zfLC5ZwIrNi56XnQkkWzC YmYFTce0RqhOkb9cxDG1GABfb7fV3F0Pjo32/jCMwpoFZFReC5KsmRRoE5vbtlQK6QnZ10 ToqBMoX2qJa1MOnlBWffF3wm3vUCulllpfXHH/2iEk3yqNx7O8M1GfNCV5Tw0g== 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 4Sgck21CwnzDCQ; Thu, 30 Nov 2023 00:38:18 +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 3AU0cI0c052034; Thu, 30 Nov 2023 00:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cIi7052031; Thu, 30 Nov 2023 00:38:18 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:18 GMT Message-Id: <202311300038.3AU0cIi7052031@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: d425c3c640a3 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: d425c3c640a395654c1e16954c76bcebe6c93cc9 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d425c3c640a395654c1e16954c76bcebe6c93cc9 commit d425c3c640a395654c1e16954c76bcebe6c93cc9 Author: Bjoern A. Zeeb AuthorDate: 2023-10-26 00:11:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:57 +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 Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D42424 (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 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 "