From nobody Tue May 19 05:43:38 2026 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 4gKNrW0HYCz6dqW9 for ; Tue, 19 May 2026 05:43:39 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gKNrV6H5Qz3b4v for ; Tue, 19 May 2026 05:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779169418; 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=T3d6fL2yKJaogeNmgmB2TnzB0DnlNf88geIuheK0Wkw=; b=LnFL8gx6hTe0QuFWtUEsvX6j+Gstjiqpt+nu9yMNJ++lbFrWOpWTLlmOro+5ilfDCIyT6b mRdFfx21kaSRp5Z/zOPxkSJIyo4vuhZW4w+ZhGtjgLvbC3espfskjRqcAQvY/nUY12JtaP 9mpawSZYg68emest+Qsb+kqnPMK8rqIx+Op6mBt5kGutVIe5jJ1RHS2Q4G/lysuMiPYhj3 zbWbqCq/fnzcCtRa2lFa0f4CLRgHxDlTaGxUkeUHL/3+Tk8JeX6IN+jewn3sUtTsl4B3A/ d83tYmPOG8/ljskicvmN+nQtc9L+Iej0dnayCCtSytN4ZcnzLcGZIVXyHppUtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779169418; a=rsa-sha256; cv=none; b=WyF/Ev/5AzqN4fB9mAZP46SoHHQi1fkxYE8C6r6pymdYUs2Gz4z4txtDk311ndp/eyb7WT D1qwXMbZT9D0ReQCHvI2sZUgvB5Zob2v+WqraZueNs+QVSSakFq+6QWip8ILTg1OyaQABC t2Ns9H00dLfuozARGZEoMYgJrjXZyHgfGIPGmr+UbSftgfIQ/dhotZjm9iI9AyW1oB0xYI FmRxJ5Kfq8X1wjdhpBTnZQStGbfUvsAGetFrekehYBqPKSPMM1aD6/GB4ROmkhgn4tNvJK lAdTIpQii9nTuZrxqghmQuZYmEcAUJYIr6sY0HDcpRrqC5hAjCZE2rXDpsgGpg== 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=1779169418; 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=T3d6fL2yKJaogeNmgmB2TnzB0DnlNf88geIuheK0Wkw=; b=BKjGUu66ogdRxLGtau9pua3zX7y/h1EXD+jUfRZsSSCqvbfLeh+AKEG3BTlSo5N4D7Ofma t/Aba5il1UrH0Dh/moClF287LrJbJjbexcT3DAivO6GluAShGbMOn3MJQjwa47lZmchfYS DmVXQHVk9uUhoK2haN30QF6hFRnc5gPqxWR7/rupucK72C8UIN5en4aUN3l7dwlxQFACW3 aACzN2Q8aeXNjFAxlKpMVTie9aFIIO6LM+PydemQDqpI1yfRfy9y4mXi29fLednDQM1+GM JGeOp1i5kYPpkw4//VO270Gr/GjjC9v0mSXGlQnjuaxuGO37mZ2bRswoGKDK/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKNrV5thXz11vy for ; Tue, 19 May 2026 05:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e889 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 05:43:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 8d36ec1c9c5b - main - net80211: migrate wk_rxmic / wk_rxmic in TKIP code to accessors 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 8d36ec1c9c5b7c545e1a7584e66e1ff9b9798ee7 Auto-Submitted: auto-generated Date: Tue, 19 May 2026 05:43:38 +0000 Message-Id: <6a0bf88a.1e889.6dc7534@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=8d36ec1c9c5b7c545e1a7584e66e1ff9b9798ee7 commit 8d36ec1c9c5b7c545e1a7584e66e1ff9b9798ee7 Author: Adrian Chadd AuthorDate: 2026-05-19 05:28:49 +0000 Commit: Adrian Chadd CommitDate: 2026-05-19 05:28:49 +0000 net80211: migrate wk_rxmic / wk_rxmic in TKIP code to accessors These are the last two uses of the wk_rxmic / wk_txmic macros. Everything should be using the accessor methods at ths point. Reviewed by: bz Differential Revision: https://reviews.freebsd.org/D54790 --- sys/net80211/ieee80211_crypto_tkip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_crypto_tkip.c b/sys/net80211/ieee80211_crypto_tkip.c index 1d368cf11eb9..4090d130a28f 100644 --- a/sys/net80211/ieee80211_crypto_tkip.c +++ b/sys/net80211/ieee80211_crypto_tkip.c @@ -263,7 +263,7 @@ tkip_enmic(struct ieee80211_key *k, struct mbuf *m, int force) hdrlen = ieee80211_hdrspace(ic, wh); - michael_mic(ctx, k->wk_txmic, + michael_mic(ctx, ieee80211_crypto_get_key_txmic_data(k), m, hdrlen, m->m_pkthdr.len - hdrlen, mic); return m_append(m, tkip.ic_miclen, mic); } @@ -417,7 +417,7 @@ tkip_demic(struct ieee80211_key *k, struct mbuf *m, int force) vap->iv_stats.is_crypto_tkipdemic++; - michael_mic(ctx, k->wk_rxmic, + michael_mic(ctx, ieee80211_crypto_get_key_rxmic_data(k), m, hdrlen, m->m_pkthdr.len - (hdrlen + tkip.ic_miclen), mic); m_copydata(m, m->m_pkthdr.len - tkip.ic_miclen,