The branch main has been updated by bz:

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

commit cdef9a9f91e2eee00e8f6f1ed743a8d8bd0bdc14
Author:     Bjoern A. Zeeb <b...@freebsd.org>
AuthorDate: 2025-04-08 00:22:12 +0000
Commit:     Bjoern A. Zeeb <b...@freebsd.org>
CommitDate: 2025-04-11 21:17:24 +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
    MFC after:      3 days
---
 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 9830d8f16d05..5c155a4c1cc8 100644
--- a/sys/compat/linuxkpi/common/include/net/mac80211.h
+++ b/sys/compat/linuxkpi/common/include/net/mac80211.h
@@ -373,18 +373,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,
@@ -508,8 +496,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. 
*/

Reply via email to