git: 350651dbc927 - stable/14 - LinuxKPI: 802.11: remove cipher_scheme support

From: Bjoern A. Zeeb <bz_at_FreeBSD.org>
Date: Fri, 18 Apr 2025 14:37:07 UTC
The branch stable/14 has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=350651dbc9275b42cb9eb342971fb52b2f934a87

commit 350651dbc9275b42cb9eb342971fb52b2f934a87
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2025-04-08 00:22:12 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2025-04-18 14:36:00 +0000

    LinuxKPI: 802.11: remove cipher_scheme support
    
    iwlwifi was the only driver we care about which "used" cipher_scheme
    and it was removed from there too.  Remove given it is no longer
    used anywhere.
    
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit cdef9a9f91e2eee00e8f6f1ed743a8d8bd0bdc14)
---
 sys/compat/linuxkpi/common/include/net/mac80211.h | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h
index 9faf58ed6ee5..dc1142270b9a 100644
--- a/sys/compat/linuxkpi/common/include/net/mac80211.h
+++ b/sys/compat/linuxkpi/common/include/net/mac80211.h
@@ -372,18 +372,6 @@ struct ieee80211_channel_switch {
 	struct cfg80211_chan_def		chandef;
 };
 
-struct ieee80211_cipher_scheme {
-	uint32_t	cipher;
-	uint8_t		iftype;		/* We do not know the size of this. */
-	uint8_t		hdr_len;
-	uint8_t		pn_len;
-	uint8_t		pn_off;
-	uint8_t		key_idx_off;
-	uint8_t		key_idx_mask;
-	uint8_t		key_idx_shift;
-	uint8_t		mic_len;
-};
-
 enum ieee80211_event_type {
 	BA_FRAME_TIMEOUT,
 	BAR_RX_EVENT,
@@ -507,8 +495,6 @@ struct ieee80211_hw {
 	/* TODO FIXME */
 	int		extra_tx_headroom, weight_multiplier;
 	int		max_rate_tries, max_rates, max_report_rates;
-	struct ieee80211_cipher_scheme	*cipher_schemes;
-	int				n_cipher_schemes;
 	const char			*rate_control_algorithm;
 	struct {
 		uint16_t units_pos;	/* radiotap "spec" is .. inconsistent. */