Date: Tue, 19 May 2026 05:43:38 +0000 From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 8d36ec1c9c5b - main - net80211: migrate wk_rxmic / wk_rxmic in TKIP code to accessors Message-ID: <6a0bf88a.1e889.6dc7534@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=8d36ec1c9c5b7c545e1a7584e66e1ff9b9798ee7 commit 8d36ec1c9c5b7c545e1a7584e66e1ff9b9798ee7 Author: Adrian Chadd <adrian@FreeBSD.org> AuthorDate: 2026-05-19 05:28:49 +0000 Commit: Adrian Chadd <adrian@FreeBSD.org> 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,home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a0bf88a.1e889.6dc7534>