From nobody Thu Feb 26 03:56:22 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 4fLyLb0B00z6TB54 for ; Thu, 26 Feb 2026 03:56: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLyLZ5ngsz3CwN for ; Thu, 26 Feb 2026 03:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772078182; 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=tjkPu1qx06sHMgECZLK894VYqbG4ggiAyAT4bO0ZiRA=; b=uWtB+7pHph9GXgUhT8bKTG5VccbnS4Z2V+dpXAZWrXf3XtH+PRIChVfBXkRAuPTzj9fAou HkN2KWmVMPMcocWAWKGzo39G9A2yKW8XuzNgaDxOLyCiMzAkoodV5QNj7PCMeq7h08KH+R Lm6YyGQO6L8B6FWRA7yj3Jxfp4wYZawVjwaOpUeOv1lk7jcWQNimso2ApZhr7DFwCUxSpb ck7ixO/+rDvtOR76mo0oIXKmZZebxV+nyDwCQkdXphEfmPPcBizYiR3TA7r+SrikJvX2tO 0VU2z0shEBmZ1uWENOHgW4yDe14AlAWqipsTsGXSxQ0+ITdM5YRJM5YP0uj9Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772078182; a=rsa-sha256; cv=none; b=uwYNsONQq2UR2seuUF0gt5QLUB+8prhwrJfZD+C9G/GOaD0m1zI3tPHvy2PhHGK8VC5ZZv ec6lxaynOnN6lj0WBPRdTtViT5C6dYFuUAIqqf5zOGzZ7+tFoORwT/C+VxZAT6S7C4FvO1 CpSxRYDDmV2dXhO794g6fT/rSpVX97ome44S1CZJIIVdIQsoyxUEhQ8meKD8Zi9yLi+IK6 RfAZhMHVjZthSBVz73lt5Broc7KFZkFAaFIHn0TYHOEcmBo0Kkk1mdwnFrx9hqBrOCdPPs 0xTG+V8YUY5Im1m4mTz6qi57A92WFGo6+6wCLu12nl7ZqTZrTS8jVaSct1wWwg== 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=1772078182; 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=tjkPu1qx06sHMgECZLK894VYqbG4ggiAyAT4bO0ZiRA=; b=GrUGNE7jfPBJ8B5DWBe6iSdKaSjDTH+vypOyRsNL1H0kG+toy24rBEHDtzIc2gc3gUlUqP hFKuuH/J4k7qMdJlpmJpkxFs2tGxtDn9itFlZj8Lul5o1v+kVOI0o+DYlh5WHm85kwnNd1 msCEqmrFdrhmlEaejzkPL2Qy8rlSOmTo+khvnl5i3/+T+FsXy2Blyx8kVzWyl1FGkJUrsm DQD1ft9Slv/xb8WJ6ddHLWjXoBlRrOQgXxLR8XiF4Brj+EVQLewDabAXgZg7WrnpCM7lx5 wNhzfNN6wJm6kd9sRpuLvOaNUwWlTk5c4YJ1Jh2dWjDxdYegDivuqbTv3cOW8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLyLZ5Gntzqw for ; Thu, 26 Feb 2026 03:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31cee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 03:56:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 70786de406b6 - main - wpi: 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: 70786de406b62bed55566ec95c932e150c25c3b3 Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 03:56:22 +0000 Message-Id: <699fc466.31cee.5fde8a7e@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=70786de406b62bed55566ec95c932e150c25c3b3 commit 70786de406b62bed55566ec95c932e150c25c3b3 Author: Adrian Chadd AuthorDate: 2026-02-26 03:49:43 +0000 Commit: Adrian Chadd CommitDate: 2026-02-26 03:49:43 +0000 wpi: migrate to new net80211 encryption key API Migrate to the new encryption key API rather than poking at the key struct directly. Differential Revision: https://reviews.freebsd.org/D54482 --- sys/dev/wpi/if_wpi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c index 471700ca9f5c..f6039c5bb790 100644 --- a/sys/dev/wpi/if_wpi.c +++ b/sys/dev/wpi/if_wpi.c @@ -2917,7 +2917,8 @@ wpi_tx_data(struct wpi_softc *sc, struct mbuf *m, struct ieee80211_node *ni) break; } - memcpy(tx->key, k->wk_key, k->wk_keylen); + memcpy(tx->key, ieee80211_crypto_get_key_data(k), + ieee80211_crypto_get_key_len(k)); } if (wh->i_fc[1] & IEEE80211_FC1_MORE_FRAG) { @@ -3031,7 +3032,8 @@ wpi_tx_data_raw(struct wpi_softc *sc, struct mbuf *m, break; } - memcpy(tx->key, k->wk_key, k->wk_keylen); + memcpy(tx->key, ieee80211_crypto_get_key_data(k), + ieee80211_crypto_get_key_len(k)); } tx->len = htole16(totlen); @@ -4627,7 +4629,8 @@ wpi_load_key(struct ieee80211_node *ni, const struct ieee80211_key *k) node.control = WPI_NODE_UPDATE; node.flags = WPI_FLAG_KEY_SET; node.kflags = htole16(kflags); - memcpy(node.key, k->wk_key, k->wk_keylen); + memcpy(node.key, ieee80211_crypto_get_key_data(k), + ieee80211_crypto_get_key_len(k)); again: DPRINTF(sc, WPI_DEBUG_KEY, "%s: setting %s key id %d for node %d (%s)\n", __func__,