From nobody Fri Nov 14 02:26:21 2025 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 4d71Gj63mDz6GhdC; Fri, 14 Nov 2025 02:26: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d71Gj5Tgqz3rst; Fri, 14 Nov 2025 02:26:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087181; 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=HPhWutu4UdaRP+lI9XANBOLpyGbkXHdy0CJAyWXh45w=; b=Pivuqk+IgTjWMJideI1oB3fi54mOH1I2CDVA2h99ln2BnZkkk3er4/VAso6ONBL8sLDpQ+ 658DoS04NmwMcVYqfkhqyhLhRw+1+r4bUHY9xARPzgif+PyCzwFYSERqctEVAlIB3A5p9F c5Trh46qYyYfBp+mPB+iNLFRUjttZ8+SQi5HFLn1krlebO/bYDUk6eq+yW+Na1uafMbUKI If0JPyHmWMuca0RDztWw2no54q4FLXRvZHVuJou3FG49Oy+3fOp4ymWSihTo7AzzuB9Qp7 scCtbODhe91H3fJoAvUhfYT5UUoNCj6O/uSk9qIQM9jUEcMa9zU5ZYDJsfAGdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763087181; 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=HPhWutu4UdaRP+lI9XANBOLpyGbkXHdy0CJAyWXh45w=; b=Wm9ha6S8tIkxvAlXIhUlg4iSesh84NsH6I86WOxZS4+KTB8wH/RQUjLtcBRG+UNhN5y9VY E4JI/ySE5erpoGSN6aCNd1Go4uMP3Jieck7EKkUImX2iv5c1ZNZTzB0EjtDzfehFXvLZpz vk+40eiKquy7rxY7WTQ5fa2P79Zapi2RqW7taFx7Ol+C6XNs2ouOZ4YI1uo3MyyJGfiSSA Vt6wgq8muSJkIvGbSjibbLh29MWNc9vM3ZTUV5yCRSdKrDiF2pnUZ+ezoa3G0mcXIMjIt/ HvW+9KvRf5xOK4cMnky5Wt7TYl0UCj628XsmEUDyBSBoOzroSYPxcNBUbep2dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763087181; a=rsa-sha256; cv=none; b=OfGmVG4DFtoNtIwM7AiXxYP8jzH7uaqOo2mk+tPUKSNRzUy830HDaeH2OmjRct8qvXA2k+ NQuhg2Sxti0H1AhYUgz1a5uVavaOSi0uc5ia/dxoCxMjQak7HovHUvqB3C5BQxf4cO7Zil VSlSeHVtKvPK9fejsrL7LrhFtXLsEq6x0TccstjHQE0resBhdDsqxQyn3Dq1EVC6ZmClVD b3M5C09hI6eDIySJpk7iG8p28slHuS5H67TNvZWBRM6wj/LMdplG3FjYVZf98z96qB+DQC RheHNUcGXbIFcYoA5OKrv47x49/Nngq0SMpWbwRoLJzSVYpv7gwgawaGP39EcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d71Gj53l9znVZ; Fri, 14 Nov 2025 02:26:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AE2QLHI080715; Fri, 14 Nov 2025 02:26:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE2QLJC080712; Fri, 14 Nov 2025 02:26:21 GMT (envelope-from git) Date: Fri, 14 Nov 2025 02:26:21 GMT Message-Id: <202511140226.5AE2QLJC080712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 333eb58deeda - main - rtwn: migrate to new ieee80211 key data accessors 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: 333eb58deeda6cc5a5a908b92301f833ba8750fa Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=333eb58deeda6cc5a5a908b92301f833ba8750fa commit 333eb58deeda6cc5a5a908b92301f833ba8750fa Author: Adrian Chadd AuthorDate: 2025-09-24 15:36:46 +0000 Commit: Adrian Chadd CommitDate: 2025-11-14 02:25:25 +0000 rtwn: migrate to new ieee80211 key data accessors Migrate to the ieee80211_crypto_key_*() routines. Should be no functional change. Locally tested: * RTL8821AU, STA mode Differential Revision: https://reviews.freebsd.org/D52712 --- sys/dev/rtwn/if_rtwn_cam.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/dev/rtwn/if_rtwn_cam.c b/sys/dev/rtwn/if_rtwn_cam.c index d142cd0476e4..83f774b56814 100644 --- a/sys/dev/rtwn/if_rtwn_cam.c +++ b/sys/dev/rtwn/if_rtwn_cam.c @@ -182,6 +182,7 @@ end: static int rtwn_key_set_cb0(struct rtwn_softc *sc, const struct ieee80211_key *k) { + const char *key_data; uint8_t algo, keyid; int i, error; @@ -194,7 +195,7 @@ rtwn_key_set_cb0(struct rtwn_softc *sc, const struct ieee80211_key *k) /* Map net80211 cipher to HW crypto algorithm. */ switch (k->wk_cipher->ic_cipher) { case IEEE80211_CIPHER_WEP: - if (k->wk_keylen < 8) + if (ieee80211_crypto_get_key_len(k) < 8) algo = R92C_CAM_ALGO_WEP40; else algo = R92C_CAM_ALGO_WEP104; @@ -211,11 +212,18 @@ rtwn_key_set_cb0(struct rtwn_softc *sc, const struct ieee80211_key *k) return (EINVAL); } + /* Get key data. */ + key_data = ieee80211_crypto_get_key_data(k); + if (key_data == NULL) { + error = ENXIO; + goto fail; + } + RTWN_DPRINTF(sc, RTWN_DEBUG_KEY, "%s: keyix %u, keyid %u, algo %u/%u, flags %04X, len %u, " "macaddr %s\n", __func__, k->wk_keyix, keyid, - k->wk_cipher->ic_cipher, algo, k->wk_flags, k->wk_keylen, - ether_sprintf(k->wk_macaddr)); + k->wk_cipher->ic_cipher, algo, k->wk_flags, + ieee80211_crypto_get_key_len(k), ether_sprintf(k->wk_macaddr)); /* Clear high bits. */ rtwn_cam_write(sc, R92C_CAM_CTL6(k->wk_keyix), 0); @@ -224,7 +232,7 @@ rtwn_key_set_cb0(struct rtwn_softc *sc, const struct ieee80211_key *k) /* Write key. */ for (i = 0; i < 4; i++) { error = rtwn_cam_write(sc, R92C_CAM_KEY(k->wk_keyix, i), - le32dec(&k->wk_key[i * 4])); + le32dec(&key_data[i * 4])); if (error != 0) goto fail; }