From nobody Fri Apr 18 14:37:07 2025 X-Original-To: dev-commits-src-branches@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 4ZfHQr5sXHz5stWc; Fri, 18 Apr 2025 14:37:08 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZfHQr0nNqz3KVs; Fri, 18 Apr 2025 14:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744987028; 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=51Z7gtbc0yOxYh4NN+AP3qkHIUpYxeJHkg5ILk9BQBw=; b=deA6NRpfVY9w4WRt3nGZHSxPbDIZH9XtFTP9Ph2fwbjiQzsYntBLCHzo0LQLMePBOHIfEQ x+gtd3VY3k9o+CIjwE8457TaQRR+tK7I/RVty0utVybl6uucl7dv+ZkQmgsnHzeDZSll3K gmGBoiUPH+dAFMyOFYu3iKZ+Lc7mP3t1swlht/WN11c2xJkjR2b7XHmgbIQlGyWnYoX77y EJk5f3FcDnRxcha0pk4albG6H+oIUtWXZQgwyGc8E41mp/i3dIM1Crwd4a7ubZS+y3MQWn RLu/MQ30ktOxCxTNKpw6sKIZoU8goINMJMXibSwxhT85xI/ehO76Pb2g4V+zLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744987028; a=rsa-sha256; cv=none; b=AHsR5231rKCvgIVVmOYbxZxZKoMyxhf1OhL3T7RL507KsY24/U2eXeTHEFr57MZRz+sQqL dCm9a9Pb8tIbZRBksZX54mrV3lYZkMA0t7QfRB/slM5WE+cOvANlo3Z+f/ds92mShvKgSE hd8ehbrC3zKV8yBqTRQKwMuddVfwlgZg5hunAA8aSn1rznexNixSb3wVyFlqyw7YRgmhuL cFekJ40gjxkhzRKAIv3OU4JAekQ5gUFXPVeNrk9R9RLmbLXdoBB+WRtBP9oiTXvMC7oDIU 0jZmsly6q51eRkTAU19KmmdI09pcJ/o9aVxYrtLSw1+Xxt2cp0ZhTm4BSxKbMg== 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=1744987028; 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=51Z7gtbc0yOxYh4NN+AP3qkHIUpYxeJHkg5ILk9BQBw=; b=aVgEQsZu6qddJTzwhELEw9Cdr2rth44BZxORaf+BZ6juza3zWL/Gc8p6nS5Ll3TkpFwEXW ir7qjXCZdVk1N3XtbfoGziSRr7KWtOtXQ2NgXC35gcGU02xR2vRFeV5QY5TP5y1nghDWz5 OPJr7mWBlQCvbBY20Ran4Tw54mBFwPp2xAiU+MJAkfbe/6Dkg0KNVNYkSQLHxJpzafC1eD MvnvzwN44bHtoKlQhI8HMer8wSEtUXdoi+DIF85W7iNK1YNlzGUi7Vz34aW7CebJS8d7XA FdXN6iuXK+JhlZKPM/+eyojNQyCrf0MmNRB8bIPxj1fpox6WaPEEG3ko4NIeHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZfHQr05GJzf3q; Fri, 18 Apr 2025 14:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53IEb7k4091656; Fri, 18 Apr 2025 14:37:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53IEb7ja091653; Fri, 18 Apr 2025 14:37:07 GMT (envelope-from git) Date: Fri, 18 Apr 2025 14:37:07 GMT Message-Id: <202504181437.53IEb7ja091653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 350651dbc927 - stable/14 - LinuxKPI: 802.11: remove cipher_scheme support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 350651dbc9275b42cb9eb342971fb52b2f934a87 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=350651dbc9275b42cb9eb342971fb52b2f934a87 commit 350651dbc9275b42cb9eb342971fb52b2f934a87 Author: Bjoern A. Zeeb AuthorDate: 2025-04-08 00:22:12 +0000 Commit: Bjoern A. Zeeb 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. */