git: 70786de406b6 - main - wpi: migrate to new net80211 encryption key API
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 26 Feb 2026 03:56:22 UTC
The branch main has been updated by adrian:
URL: https://cgit.FreeBSD.org/src/commit/?id=70786de406b62bed55566ec95c932e150c25c3b3
commit 70786de406b62bed55566ec95c932e150c25c3b3
Author: Adrian Chadd <adrian@FreeBSD.org>
AuthorDate: 2026-02-26 03:49:43 +0000
Commit: Adrian Chadd <adrian@FreeBSD.org>
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__,