From nobody Tue May 14 21:39:49 2024 X-Original-To: dev-commits-src-main@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 4Vf8s21BtRz5L45P; Tue, 14 May 2024 21:39:50 +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 4Vf8s16FlPz4Sd6; Tue, 14 May 2024 21:39:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715722789; 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=YeK+QgaMi3wuRffNc0grFL/NGOKl2YjyAIv/F/Gu+ig=; b=R8GZNeFbDISwFvV8tttcSu7h2UOxocFTMR+JLsD96yo7vjetA9U9ittTK937qbxerBDzP7 DfvcLrSBphVtzLxUgD2rNZvJY0pfo86ocXNfiG3boz8eF6trbzR6AcOGGSozZ6VJValCkv M6Vszf6OP/JKxMtP1AJSKT6oA3df/eKheQ9EuCFNvExyhduIudbijdYO/gFJT92sfair8V X36w0xAlb4zyTDGfwHW9Un2BNzpi9TTLj3e4iHX/MqGGGvwcDRUdPMabh1EsDBA16315+p YJ/3nAAib0Q0J/NunHRWivfywmm68yelapnaiIFr/afOjF+PYRfMiB6b6l83iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715722789; a=rsa-sha256; cv=none; b=AIxvwHnlSj6hYLQDwcY8INXpDB4bf2rQ2PfRykjE2O8YotJeuQdihdaY1+LFPdmUpfakwO CH5ZTBGgIzmfv2GuqM+hTOo1acp8tGNgiBMN2ciC4kLjfMw/2tSTWfFSUclBhJblJp/HHP grhnjxVRzUr2SD6I6UYMi/9JCbzqTfUSxu1SmkJUYR2HuWsDQXkLPA5K6bfbbEyP7eXTu7 2NBJn4LDyGr7wbusPCigbPloZ+AJBdr/jMGHA25ROb8zFAzC4nCNOdRha8eLYDN57luOmV 1OGgEuf+nCRS6pwBtQ5V1eWdryhtlRCIgw3NhrUK33pBNJ80FcEoHcWmcL8QQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715722789; 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=YeK+QgaMi3wuRffNc0grFL/NGOKl2YjyAIv/F/Gu+ig=; b=mD4EkZZWfHEsoJCNrX/RSnZkRC+OcDgSz6NshryOr0+mhD9OZCWfLnnG26bAwsM5+5noUv gCoEAgnba5zBBiLusiAbZqv//Y9PUAu95iJL6I1isCurxcU5eJSHBGTk83C5OBL8zvqz1A tTmp1Rg8VV+GSvemjCg2hwGymJEhlo01NKsgAqwhbW08QtTm3WofAuWO6tI92YOn6x3fzd GxJyXIqTCmYBIIKqBS6JCA9rSBcIA6hlTIQzs9PkB92j8dlHUwhQvVFjJTshbODfWzuJ/R mnQzYYRImFSTz/E/drBbrsq0UAyb4XYFqaGxFilOBPKS0LRYuYi6bZV4evzHKg== 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 4Vf8s15t1wzp6X; Tue, 14 May 2024 21:39:49 +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 44ELdnOa094410; Tue, 14 May 2024 21:39:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44ELdnZE094408; Tue, 14 May 2024 21:39:49 GMT (envelope-from git) Date: Tue, 14 May 2024 21:39:49 GMT Message-Id: <202405142139.44ELdnZE094408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: dcf6ab2f2e38 - main - net80211: allow a single wlan crypto module to register for >1 cipher List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcf6ab2f2e38238f11b8f3b20f05ab43f73618c3 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=dcf6ab2f2e38238f11b8f3b20f05ab43f73618c3 commit dcf6ab2f2e38238f11b8f3b20f05ab43f73618c3 Author: Adrian Chadd AuthorDate: 2024-04-22 03:36:05 +0000 Commit: Adrian Chadd CommitDate: 2024-05-14 21:39:24 +0000 net80211: allow a single wlan crypto module to register for >1 cipher This allows a single wlan crypto module to register for more than one cipher. Without it, duplicate linkerset structs are initialised for the actual module loading machinery itself. I've tested this in my private tree with wlan_ccmp providing both 128 and 256 bit cipher support. Differential Revision: https://reviews.freebsd.org/D44901 Reviewed by: bz, cc, cy Approved by: bz, cc, cy --- sys/net80211/ieee80211_freebsd.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_freebsd.h b/sys/net80211/ieee80211_freebsd.h index ec017bb21ec4..b58c55cc7652 100644 --- a/sys/net80211/ieee80211_freebsd.h +++ b/sys/net80211/ieee80211_freebsd.h @@ -417,8 +417,7 @@ MODULE_DEPEND(wlan_##name, wlan, 1, 1, 1) /* * Crypto modules implement cipher support. */ -#define IEEE80211_CRYPTO_MODULE(name, version) \ -_IEEE80211_POLICY_MODULE(crypto, name, version); \ +#define IEEE80211_CRYPTO_MODULE_ADD(name) \ static void \ name##_modevent(int type) \ { \ @@ -429,6 +428,10 @@ name##_modevent(int type) \ } \ TEXT_SET(crypto##_set, name##_modevent) +#define IEEE80211_CRYPTO_MODULE(name, version) \ + _IEEE80211_POLICY_MODULE(crypto, name, version); \ + IEEE80211_CRYPTO_MODULE_ADD(name) + /* * Scanner modules provide scanning policy. */