From nobody Wed Feb 11 06:05:20 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 4f9nwK3y3cz6Ryt1 for ; Wed, 11 Feb 2026 06:05:21 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9nwJ5klBz3gbX for ; Wed, 11 Feb 2026 06:05:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770789920; 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=ZPDjNKX2SgTaylSVohYI0QGs0GHUPqjO3Dg4kY2tKx4=; b=mf9WFzInw7zWyFsQT/N+ovxY99ANZobax5dLHWnd9tmudDjWOLsJrLQfyamnYjlG8NI0Lz MGEnxLZSfoDsQXfzTAuPuy9YKIOEeyQ9RATdcW1RPK4iR3dR1Fw/tBi+vUZSeDv9JOYnud OJvf+HSvDrQ/psyah5NfM3dj2dn1felHdh+swNSp1rI62qDJg42JTneeDY2lr9bFCDi5no wG1jT2kX2H56awTXBaPjlJeyXgvRifZXqqB0Q1bzghPl4ZJH0QwbwD83MmvIf5TZxvaiq/ uPgwfq8XC+IL4aZhHyA0ZpCrv8uyIzHaADSgl524tdYlxV6ws9cD94l6Vyb1bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770789920; a=rsa-sha256; cv=none; b=bcyhNrMvja0ZBn+bwg+vlxEshfzXsvCThKt0fGBLKRPLd1/qPdlYkecTQqH5bNt9K4aFVC httE/X7pLM4TvJzvVptqytMw6mH0OtpIHk7QdoFM6vDJQAyd7yHM6g8FSxqTOetR+oIZKD JtdqDWOJVSzimRpAHLjzYiMlYQzk4lEG9ZjvQK1mT4xlvUyvhOpJ3c922K5i2+e0WdnsG1 YEAz9cMa1Eo9w+yNtNPQ7AzBtjoDZEK8sBpqKIX6i/KHASPdgJElCJd5DuNHFYN7gEDfvU CbghxYd/EuC0PSCpxaHZplaboW++dhQYcTdcYtHdWR2t0DoNo0INGZzsrNshNw== 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=1770789920; 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=ZPDjNKX2SgTaylSVohYI0QGs0GHUPqjO3Dg4kY2tKx4=; b=PWcUQ879bSCl6GYSzB6XamNr4JTERmQw785Y3vrkFjVCEY1gb/JUogRZHsVeLlDQ7EZ6c4 v9qGZUhv3S2kuETMkGeuBtu7V0hUSagXuQrxKu8zBqaAfWY19C5p0dJEn5pcoCoe9x/JhA k3Xlz8/JIbdzBWJCkQtBeJgmoMbbGKtbw0GuiHEddAEWV5Z7UxgUQ3pCZ2439fCfXEPrpH UQc8t9vs+6dSAVJXdx91TVVr9G04YSKgOOqlsUnd6CR+myzBYqZWGvbl+wfQeIt+UAkTMr ALT3zPmx5jHWaSpoUKa+jViU0j1f/o+Ep43Rm+Keif0HiQcKqcyo9Dep5KX8ZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9nwJ1fS0zdfb for ; Wed, 11 Feb 2026 06:05:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 327cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 06:05:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: c08ee1eba989 - main - iwx: migrate to new net80211 encryption key API 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 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: c08ee1eba989b49c7c30945a551760eaeb2e3e15 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 06:05:20 +0000 Message-Id: <698c1c20.327cf.4efbecc0@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=c08ee1eba989b49c7c30945a551760eaeb2e3e15 commit c08ee1eba989b49c7c30945a551760eaeb2e3e15 Author: Adrian Chadd AuthorDate: 2026-01-02 04:32:39 +0000 Commit: Adrian Chadd CommitDate: 2026-02-11 06:05:03 +0000 iwx: migrate to new net80211 encryption key API Migrate to the new encryption key API rather than poking at the key struct directly. Locally tested: * STA mode - iwx0: mem 0x84c00000-0x84c03fff at device 0.0 on pci4 Differential Revision: https://reviews.freebsd.org/D54463 --- sys/dev/iwx/if_iwx.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c index 3c953e522973..8f11e6a414e7 100644 --- a/sys/dev/iwx/if_iwx.c +++ b/sys/dev/iwx/if_iwx.c @@ -11069,11 +11069,13 @@ iwx_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) IWX_UNLOCK(sc); return (ENXIO); } - memcpy(cmd.common.key, k->wk_key, MIN(sizeof(cmd.common.key), - k->wk_keylen)); + memcpy(cmd.common.key, ieee80211_crypto_get_key_data(k), + MIN(sizeof(cmd.common.key), ieee80211_crypto_get_key_len(k))); IWX_DPRINTF(sc, IWX_DEBUG_KEYMGMT, "%s: key: id=%d, len=%i, key=%*D\n", - __func__, id, k->wk_keylen, k->wk_keylen, - (const unsigned char *) k->wk_key, ""); + __func__, id, + ieee80211_crypto_get_key_len(k), + ieee80211_crypto_get_key_len(k), + (const unsigned char *) ieee80211_crypto_get_key_data(k), ""); cmd.common.sta_id = IWX_STATION_ID; cmd.transmit_seq_cnt = htole64(k->wk_keytsc);