git: c08ee1eba989 - main - iwx: migrate to new net80211 encryption key API
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 11 Feb 2026 06:05:20 UTC
The branch main has been updated by adrian:
URL: https://cgit.FreeBSD.org/src/commit/?id=c08ee1eba989b49c7c30945a551760eaeb2e3e15
commit c08ee1eba989b49c7c30945a551760eaeb2e3e15
Author: Adrian Chadd <adrian@FreeBSD.org>
AuthorDate: 2026-01-02 04:32:39 +0000
Commit: Adrian Chadd <adrian@FreeBSD.org>
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: <Wi-Fi 6 AX210> 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);