From nobody Fri Nov 3 21:08:23 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 4SMYHq4Q5Rz50Ncl; Fri, 3 Nov 2023 21:08:23 +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 4SMYHq2GtDz3Mms; Fri, 3 Nov 2023 21:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045703; 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=VzTo1VKUtl7oyInXtEPAksLZc+oeuSvu4t/+MM9v2V8=; b=bpu02ov33n6lL8OaeNajA/VFJcMP6VmArgmonBtNd++8/vMuR3LWevPSZliQEZhh0Vnunu CsiI1EclzvHKCYhKNJ0joOZZ+lxAyzdIysLVVGolzSZvJZsXhsYxoRalMY9l3SJqiO9H5W 1EM5H+Y6N56aSjWaiR2C7CxE7v1tpxtJPP+Z97a4YwM7jg/yYeZpC4D4SZ6vwCKokQHJtX oCYiprOaY5fhX3NK+/5UMOHH/aEshHW4P22zESxqmLSK1B42F1koExEym67XzRGnHuo3yL Hx5QdJ8Sb8+ALpfbqrNaI/oWfCEWlOu0VKzuPBSMzaDNCuubVGCyCBW7tUNDLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045703; 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=VzTo1VKUtl7oyInXtEPAksLZc+oeuSvu4t/+MM9v2V8=; b=mQRkjzYXbAdzFzamQQv19rcR9sg3bacwbBIH/mXhXoWyNR4BGsbvpHBCS+7guvu7DozPpu 6VroRjKbjxwWw5R24T0MqztIg8Y128gk5pR/5Yz4H8Akr7qjUvgxwTslLn1Jw2NZtrcZL3 UOYwbcfPqbfh1d356RuaueEZzCxCSBYvj6aPlW8Fujab6iJVF55FLooRw5emG8z9zoteks 33OrqUgLa2YS08M2lXq588vqt+MghgXArqKxlzdrPe+ACGPEmqCvukkmzCb/ikAERIdMPW F9wEDBWy9PrAZsLwZK0GWvsYWxkZ3gC8vXLPLsBx04h/FSRsymSIJ4AhATaiVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699045703; a=rsa-sha256; cv=none; b=EPozNpNazT6NSEHhGvbgMW4LlXmHSE+V7JAqAQNylzz+ibYj+tByJuVx4cez80Wsk8j2Ed xzIiXasDxej/iBMcuvd45ysHWsymWpAxnJRllBmFhPUIB9jp14m03E7tblnGDo4J5WUn9r 4uGceQpghC2N9rQ+Uc+COAg49YCFp4I+TINYcomrOE4ScbGY3EitIaIEniD5wR9zADVH5z yDYt+lcpW/APjnP8MKnHbOpw0YBWko/MtIsukLnVnX+Iq+UiCkdmg3DoQdzLUI8NXqmUnw Pl38EqWhfF6bc6ABtGuG9OHWvvFgjtGqPO0UbR63dFbD/UVhVEedQl3+T3Dqeg== 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 4SMYHq1NK5zVck; Fri, 3 Nov 2023 21:08:23 +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 3A3L8NX9081125; Fri, 3 Nov 2023 21:08:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3L8N1Z081122; Fri, 3 Nov 2023 21:08:23 GMT (envelope-from git) Date: Fri, 3 Nov 2023 21:08:23 GMT Message-Id: <202311032108.3A3L8N1Z081122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5856761fd5f6 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 5856761fd5f675c3871a82effdbf714a1d1bcc5e Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5856761fd5f675c3871a82effdbf714a1d1bcc5e commit 5856761fd5f675c3871a82effdbf714a1d1bcc5e Author: Bjoern A. Zeeb AuthorDate: 2023-10-26 00:11:43 +0000 Commit: Bjoern A. Zeeb 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 "