From nobody Fri Apr 11 21:26:16 2025 X-Original-To: dev-commits-src-main@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 4ZZ8r863QJz5shVk; Fri, 11 Apr 2025 21:26:16 +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 4ZZ8r839M1z3tVG; Fri, 11 Apr 2025 21:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744406776; 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=TktnMZ5ZjwdSujoYfOG9ZpRudSI1c/smfHu294Pc47U=; b=Uk7hcUbTrEyw+myjn2fWIoADCYLWtEu0PEkjffxCmfKTeJPRMT6y97QdJKjBky6+vIPuKN edBJMk27QOP31Ecc6eQoUh4YVRXPXfikRb0ajlkkuNVXMFVHAJ3LOA/SoAhHylDUWHpVQS fiC4sRinMrlpVK4Wd4D6+FIFeAUM/a/mWmRaRSUjJt7O8ui+U8r3OMyMBTnnUT1SgFM8Fz 3cuFE2LtxRu6DvfpTRqjqG2vSWNWWJ6KDfFC285IC+XuWTWpxdw469yBG6vvCtmpkUO5rP N/3QdO7LLfYAQ5V2HWhit2S6LBT/xgp9Av5WXOcL8aw8ZBsW82/nVYwJIf4X+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744406776; a=rsa-sha256; cv=none; b=EiXignW3Ff+xYJqyeMJ7OTnidxEeav20M3t9ePmX1/ve7MdbM+Jo7ho16tjD0Nm09qvhAb /2cHL4Xh8DyJS0qRyeIvjIwpeJx9or2H0BCpdKM4l037yvjznlNzosRhQBlOjU/9J0bHGK YdYdb3WNO/b8pZJbPhftMoNmHTUxAAl8OkB91rPW8coFMMdOA9/s+zBumRxfCg7efkGK+E P6SNjoHpkByVruIOsAXtKrR7heFZ3TOVB3M9E7HKZ/fOZKuzJYPSO0JwKFbct8yPlmihvZ HUpffCE+9etzvVQ06Mc5Eh8ERZ4lj419ORwXCooUyVU+NDuK8uiw2os9eqPhhQ== 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=1744406776; 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=TktnMZ5ZjwdSujoYfOG9ZpRudSI1c/smfHu294Pc47U=; b=Sc8X6utrxtmi4yaizCpBdH1aeH7SKQTTkx+HhtwTA8JMoaiwbQJTHLhkaS0lv9Y4zXolk+ uSyPnbO8SQxZq5ZJd4mbRHJIs38kISsemeLbvsHwQX3vNrfrKjVYvo6PZjx9L3BDotfp9j CU/ZchRIjjamd0MiT5ImiTVjOTfzuUKoE7ABs08SQFHU802ue0KwuaM0RPCDqbW5RiOIwW UVk6az7N2N6Lkzpwh2OARy4MdhZnVt2xPaYLJ/dD8N57m/3aLsmpRtYXXyUqUStNWNRzPL HL2qzXwixX5OnzvwZl2nRfRfSs8gbMMwR5NKPyTi9BSvSdvZfgHsqq+xSNPWdA== 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 4ZZ8r82VntzqHc; Fri, 11 Apr 2025 21:26:16 +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 53BLQGen078080; Fri, 11 Apr 2025 21:26:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53BLQGtj078077; Fri, 11 Apr 2025 21:26:16 GMT (envelope-from git) Date: Fri, 11 Apr 2025 21:26:16 GMT Message-Id: <202504112126.53BLQGtj078077@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: cdef9a9f91e2 - main - LinuxKPI: 802.11: remove cipher_scheme support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: cdef9a9f91e2eee00e8f6f1ed743a8d8bd0bdc14 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cdef9a9f91e2eee00e8f6f1ed743a8d8bd0bdc14 commit cdef9a9f91e2eee00e8f6f1ed743a8d8bd0bdc14 Author: Bjoern A. Zeeb AuthorDate: 2025-04-08 00:22:12 +0000 Commit: Bjoern A. Zeeb 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. */