From nobody Thu Feb 26 03:56:21 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 4fLyLZ6hYhz6TBGW for ; Thu, 26 Feb 2026 03:56:22 +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 4fLyLZ161fz3CR5 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=jsLcqRQBMiMMv0N4XL1DEixRdorR4OWEpf3e0p9YYSU=; b=DTB89oAuj4s5mMMB5+jndMQf1dIWYWa8+yHT79B6Kye6nOElgnYUO/jBI5FQ5HOaYPN2zR Vanw0w9A25LHQAwQsQ3CXTLsJH2Jlr1J2CoK8hgjx7jVt7AEcNe+mkVozxknmSrOeBy66h bvv3wqYTYJo7tpla2WQxwCNo8TZop6KpTWxmRPJof1fFnC24i1KuGF+PYq1AclBngKs5FR FKUS+jUcaP/f6q0M+9ZU4/lQQIOGf4KPoE4XLx35wT6ZsD/siGBAFJ+wTfbfQfPi0FjWKT 61ZOB8XNHytbiFtMz0jEIDDxj4pXENMRy2QQ0A51egcYl6qX5D4RgobGa0JyqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772078182; a=rsa-sha256; cv=none; b=u+XTK/yJgTDRU98IwVnqLrF+f2q0vMcbdselk9pmjX2bKNcVyGO4rleYjRp4YLyHg93Etx caMltGw9VkDanLk5zycXmUCqugwzuJBeq8ud+r6IsCTx63cfTit+bK6uuQh8FFxEbmKxGe 1sv7cMZXUpRWZQKEeJlIlX5oBgQdXxG6o+CWaF6x6bo1xPIa7zZf4dVIXANDCzJa4708Tm Jkl3o5O7gQ/Ppl0IWQH9j8A/tlkoapcJHY/XTF92hOJwe6s3qK4j+6HUGqQeid48poP0ft e0VxJT7866deo0ssSGZXm6LPjeQGhaKI2OdmrK9W/+ODPfoBb/UyDH9nKSJlOA== 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=jsLcqRQBMiMMv0N4XL1DEixRdorR4OWEpf3e0p9YYSU=; b=qeH1/j9PuDTRDQw1MbSLxipNZrfpuuJ6q47c/odM3U8vkuxHzWeaa80RgLGtZEXm18kFgD EvTwFhuiKdfAfRMcDLYwqasZmEa7muFRguale3hlJb9rmrPUFInY0meY3CJhs9OluGUET3 Vi4lC+pppTIfydiEuSelFG6yN3xT29wf1jC1yfAijCNxJjxbfr5gXDWVOuBXa8YYVJkmfn 2qZ/3Swsp27uewlBiw26mzQZeHdOrX/U1C19WWFCekSeXlWeGx1oBTaHA6eckpUlnKrRYb 0tZooUb1LD3J6wlvA/rJzHkFyxrih+oXu51A/kDvyHkBKTxVedlhVgcSpNj8Ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLyLY4hl3z1Dg for ; Thu, 26 Feb 2026 03:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 328d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 03:56:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 76a20323fcfb - main - iwi: 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: 76a20323fcfb9df34cd8529129cad0c4317115fb Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 03:56:21 +0000 Message-Id: <699fc465.328d2.30049797@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=76a20323fcfb9df34cd8529129cad0c4317115fb commit 76a20323fcfb9df34cd8529129cad0c4317115fb Author: Adrian Chadd AuthorDate: 2026-02-26 03:49:38 +0000 Commit: Adrian Chadd CommitDate: 2026-02-26 03:49:38 +0000 iwi: 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/D54481 --- sys/dev/iwi/if_iwi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c index 26b8037186a6..8146b513d4e6 100644 --- a/sys/dev/iwi/if_iwi.c +++ b/sys/dev/iwi/if_iwi.c @@ -2534,9 +2534,10 @@ iwi_setwepkeys(struct iwi_softc *sc, struct ieee80211vap *vap) wepkey.cmd = IWI_WEP_KEY_CMD_SETKEY; wepkey.idx = i; - wepkey.len = wk->wk_keylen; + wepkey.len = ieee80211_crypto_get_key_len(wk); memset(wepkey.key, 0, sizeof wepkey.key); - memcpy(wepkey.key, wk->wk_key, wk->wk_keylen); + memcpy(wepkey.key, ieee80211_crypto_get_key_data(wk), + ieee80211_crypto_get_key_len(wk)); DPRINTF(("Setting wep key index %u len %u\n", wepkey.idx, wepkey.len)); error = iwi_cmd(sc, IWI_CMD_SET_WEP_KEY, &wepkey,