From nobody Sun Feb 22 03:29:52 2026 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 4fJTxr3GXvz6Sqkb for ; Sun, 22 Feb 2026 03:29:52 +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 4fJTxr2Xywz3JSC for ; Sun, 22 Feb 2026 03:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771730992; 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=VtoH8aqXUJ8yLvfmcyE4BOXVHjA8jZJqVWWVKTOejMc=; b=Ab2cScgs5En/a6jzwtYylrlssEMockFQ/GQ8+p23xDxkeO4DGcEARMMrAjxrtw+6ZrqfyI bOgQaKJaiKWERhlky5I/RW2CtI70Idy2zPi3avNX4H1tjC/RMtbukdS0OwOVT50AfsCFvn wXtVgNtEMvRmidvCaqxTZF4pCl76rTe/TjFYhjT78tJUjiOGqoRqlZzMUzx1XRxs9xp6hl jBBI+sTLVhNTHj6yuzcl/uZvEkoQ3GGKosQvx6gLrDpGF9BTyQbhCoIwcE+9y6vE5kCUo4 u6Jmo3hjod6OkixjfOqQ3qvvpXI7lZuZvzDkThoealUrDZlIE9JfmxsIUeptcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771730992; a=rsa-sha256; cv=none; b=svF1j9rNRxHKaEsac36DgP9eakzLtjwXo6ArilJwRb95QFr7v68qPZYywwsk/IE/escrqn czckXNbFYaMLj75GrbsXab6xn1mSQW0vr/zfFc06rV8W3kug+e1nbzaPomZkvOrbcVrwpt 7BjlXBnTjbGnTbAj0dup/J5gmbSXPnPZ57Cir1Y05LlKadUXqOiuevIv0WOxb70aoZN0Vp pJAg+KVSkRZ8XS32DrC1+k6DCQ6PjkLjJhcrkSQaoFpIeQzkdqyyl5pPuTwkgWr3D6u0Uz KJsh9lpzQs0Jam8UtJrcdAy8ayTgwFi91vhOmQXNEJjV+GihhV9YiEzm/ujxOA== 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=1771730992; 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=VtoH8aqXUJ8yLvfmcyE4BOXVHjA8jZJqVWWVKTOejMc=; b=LugAw5jIDHzXT0pWFFzQYkjQ2k8+FFK+zgiMB1MGfNJq6u6+XRrusMFNvhcJFpFQcCN5fB IKLvu4aSHQmqjq09hV9pruvxjlfYJbtV9VY26NW/D0iv0aznUuXFNuveMr82Uh/Gu+8bkd Vi2ZESQoZub5QAu0oztNdd6zqBcvrynEyTxDydxhjgKReR7aewrhSHfVopDtX3+ZR/XhXW TDcV74mddmOIwnKXnGIbzM4LeaXQPg4vFPxAc1Y3VrwS6LVIxRw1CNni8qA3IaJxD/GI+s schDbiAG8UmG224vlfS9oojwRV1EPtzlzP4Z+L6wa4Pn/mqODVne+w7WVv0Ccw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJTxr1yKLzBfd for ; Sun, 22 Feb 2026 03:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f967 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:29:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 6a6152bc292f - main - rsu: migrate to new net80211 encryption key API 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: 6a6152bc292fbd86015507978c6d3556ef3915a1 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:29:52 +0000 Message-Id: <699a7830.1f967.50a3a96d@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=6a6152bc292fbd86015507978c6d3556ef3915a1 commit 6a6152bc292fbd86015507978c6d3556ef3915a1 Author: Adrian Chadd AuthorDate: 2026-02-22 03:29:44 +0000 Commit: Adrian Chadd CommitDate: 2026-02-22 03:29:44 +0000 rsu: 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/D54483 --- sys/dev/usb/wlan/if_rsu.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sys/dev/usb/wlan/if_rsu.c b/sys/dev/usb/wlan/if_rsu.c index e976948f6849..2f934737f699 100644 --- a/sys/dev/usb/wlan/if_rsu.c +++ b/sys/dev/usb/wlan/if_rsu.c @@ -1724,7 +1724,8 @@ rsu_set_key_group(struct rsu_softc *sc, const struct ieee80211_key *k) RSU_ASSERT_LOCKED(sc); /* Map net80211 cipher to HW crypto algorithm. */ - algo = rsu_crypto_mode(sc, k->wk_cipher->ic_cipher, k->wk_keylen); + algo = rsu_crypto_mode(sc, k->wk_cipher->ic_cipher, + ieee80211_crypto_get_key_len(k)); if (algo == R92S_KEY_ALGO_INVALID) return (EINVAL); @@ -1732,13 +1733,14 @@ rsu_set_key_group(struct rsu_softc *sc, const struct ieee80211_key *k) key.algo = algo; key.cam_id = k->wk_keyix; key.grpkey = (k->wk_flags & IEEE80211_KEY_GROUP) != 0; - memcpy(key.key, k->wk_key, MIN(k->wk_keylen, sizeof(key.key))); + memcpy(key.key, ieee80211_crypto_get_key_data(k), + MIN(ieee80211_crypto_get_key_len(k), sizeof(key.key))); RSU_DPRINTF(sc, RSU_DEBUG_KEY | RSU_DEBUG_FWCMD, "%s: keyix %u, group %u, algo %u/%u, flags %04X, len %u, " "macaddr %s\n", __func__, key.cam_id, key.grpkey, - k->wk_cipher->ic_cipher, key.algo, k->wk_flags, k->wk_keylen, - ether_sprintf(k->wk_macaddr)); + k->wk_cipher->ic_cipher, key.algo, k->wk_flags, + ieee80211_crypto_get_key_len(k), ether_sprintf(k->wk_macaddr)); error = rsu_fw_cmd(sc, R92S_CMD_SET_KEY, &key, sizeof(key)); if (error != 0) { @@ -1764,19 +1766,22 @@ rsu_set_key_pair(struct rsu_softc *sc, const struct ieee80211_key *k) return (ESHUTDOWN); /* Map net80211 cipher to HW crypto algorithm. */ - algo = rsu_crypto_mode(sc, k->wk_cipher->ic_cipher, k->wk_keylen); + algo = rsu_crypto_mode(sc, k->wk_cipher->ic_cipher, + ieee80211_crypto_get_key_len(k)); if (algo == R92S_KEY_ALGO_INVALID) return (EINVAL); memset(&key, 0, sizeof(key)); key.algo = algo; memcpy(key.macaddr, k->wk_macaddr, sizeof(key.macaddr)); - memcpy(key.key, k->wk_key, MIN(k->wk_keylen, sizeof(key.key))); + memcpy(key.key, ieee80211_crypto_get_key_data(k), + MIN(ieee80211_crypto_get_key_len(k), sizeof(key.key))); RSU_DPRINTF(sc, RSU_DEBUG_KEY | RSU_DEBUG_FWCMD, "%s: keyix %u, algo %u/%u, flags %04X, len %u, macaddr %s\n", __func__, k->wk_keyix, k->wk_cipher->ic_cipher, key.algo, - k->wk_flags, k->wk_keylen, ether_sprintf(key.macaddr)); + k->wk_flags, ieee80211_crypto_get_key_len(k), + ether_sprintf(key.macaddr)); error = rsu_fw_cmd(sc, R92S_CMD_SET_STA_KEY, &key, sizeof(key)); if (error != 0) {