From nobody Wed Apr 23 16:25:14 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 4ZjPbH0NHjz5tbR8; Wed, 23 Apr 2025 16:25:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZjPbG66KSz49Kx; Wed, 23 Apr 2025 16:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745425514; 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=1fFvTdGStRgX9Dl7yRKwtSnmkiG8bJ/fZkTzLOq4HeM=; b=hK1/HnhoI3dmjbHESocjJvjhYpc9OcBCHR64srsssNZ3w3Ckq9BL1e52ixBNzEdwlkbv9l VXYM9obimptonhouB/IqeeYnsgR99q2BKLe49xqaA+qTIfJSk4SJPvporlCHWecAVsZ3IP GPGrCVLjVG01Up2fTnpO4p7VkOm1KoA7DUVE32zSgVEk7zjC1F1MGcpHU4aYmwrGgQaSi6 +zXwYHP4BUQ0a4OozAVHO6BH8gAKEda137XV5t/2EF91ie0gN/2s4n+KxzLEcrBTJVwj9u bkAEtPioECzxSWbTk/7O2qcuIncQIlLEFNHciliNebgatuOLymq9irAGFrMqsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745425514; a=rsa-sha256; cv=none; b=oEiPA3NZrwg6pM2fJQPLiKpJIy4gSB3yDH5WZicuPsu5I7ZuEXfk5E6CL3IKqzzYK8+1Ri fh0lrCyB14M7uyR+2bSU2LOT8AoprHvzODV7bYUZy7XvOvXS7/cVpD8Yk+PZ3B+/3xSJKF kXg/qfiBd++xk/3kZt3d+BJ8jeZm+1RM89oPLG9+7sN2wRfpkw2Jt5VP0tF3mg+k5GLuqr UIKtHO8xMrBdLinCEcV+3Nge7ms2HXQ1KcoHnXceQofbkaPFgul0y7ey9hWu8qtLdES6+b yaHCNMv4kM1SW3Sdma33tba81JeiKaddKUYNDh+wKon3RmyUgpkgKKrr4u7IVA== 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=1745425514; 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=1fFvTdGStRgX9Dl7yRKwtSnmkiG8bJ/fZkTzLOq4HeM=; b=AtNBnTRYPaVWWbScXRzF0r0N7ZhUFMMDwZk52kqxWOMYPrH47Av8N5qm044x+G+aQkY4D1 Q6yCoyY3DZdG9ZP70zAmd/keQHPYUh+0cL2fmPzJZm42YqOaWG1AHq+5DXdYUXuhGejDmv HyxuCXmZnAX8uhsUhIdA6k3hrAyZ+bWe+cZ1uH1XBeVmVqEK99kmS3AsgKbTddnqeFkC9/ etwhF+7soM3R77OuW40aL9KrB14CHvimhiO7K5Kt3vpw/34Q2RenyxPCepuItkJFHVbtgI 4vSKKxeelAtB5tvdypV01/3/yyTuZFWIuTtR1XlRGkPJumnVPe1RO5oB7Uaxaw== 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 4ZjPbG5NKCz19mS; Wed, 23 Apr 2025 16:25:14 +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 53NGPEKN081732; Wed, 23 Apr 2025 16:25:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53NGPEoB081729; Wed, 23 Apr 2025 16:25:14 GMT (envelope-from git) Date: Wed, 23 Apr 2025 16:25:14 GMT Message-Id: <202504231625.53NGPEoB081729@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: b31f33c02844 - main - LinuxKPI 802.11: move key-related functions together 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: b31f33c028446ff3e3cee32c1f0038f693683f78 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b31f33c028446ff3e3cee32c1f0038f693683f78 commit b31f33c028446ff3e3cee32c1f0038f693683f78 Author: Bjoern A. Zeeb AuthorDate: 2025-04-15 13:00:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-23 16:24:19 +0000 LinuxKPI 802.11: move key-related functions together No functional changes. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/mac80211.h | 87 ++++++++++++----------- 1 file changed, 45 insertions(+), 42 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 8856eee8c696..568695dc2a45 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -1705,26 +1705,6 @@ ieee80211_find_sta_by_ifaddr(struct ieee80211_hw *hw, const uint8_t *addr, return (linuxkpi_ieee80211_find_sta_by_ifaddr(hw, addr, ourvifaddr)); } - -static __inline void -ieee80211_get_tkip_p2k(struct ieee80211_key_conf *keyconf, - struct sk_buff *skb_frag, u8 *key) -{ - TODO(); -} - -static __inline void -ieee80211_get_tkip_rx_p1k(struct ieee80211_key_conf *keyconf, - const u8 *addr, uint32_t iv32, u16 *p1k) -{ - - KASSERT(keyconf != NULL && addr != NULL && p1k != NULL, - ("%s: keyconf %p addr %p p1k %p\n", __func__, keyconf, addr, p1k)); - - TODO(); - memset(p1k, 0xfa, 5 * sizeof(*p1k)); /* Just initializing. */ -} - static __inline size_t ieee80211_ie_split(const u8 *ies, size_t ies_len, const u8 *ie_ids, size_t ie_ids_len, size_t start) @@ -2052,13 +2032,6 @@ ieee80211_sta_uapsd_trigger(struct ieee80211_sta *sta, int ntids) TODO(); } -static __inline void -ieee80211_tkip_add_iv(u8 *crypto_hdr, struct ieee80211_key_conf *keyconf, - uint64_t pn) -{ - TODO(); -} - static inline struct sk_buff * ieee80211_tx_dequeue(struct ieee80211_hw *hw, struct ieee80211_txq *txq) { @@ -2338,18 +2311,6 @@ ieee80211_channel_switch_disconnect(struct ieee80211_vif *vif, bool _x) TODO(); } -static __inline void -ieee80211_key_mic_failure(struct ieee80211_key_conf *key) -{ - TODO(); -} - -static __inline void -ieee80211_key_replay(struct ieee80211_key_conf *key) -{ - TODO(); -} - static __inline uint32_t ieee80211_calc_rx_airtime(struct ieee80211_hw *hw, struct ieee80211_rx_status *rxstat, int len) @@ -2408,9 +2369,22 @@ ieee80211_data_to_8023(struct sk_buff *skb, const uint8_t *addr, return (-1); } +/* -------------------------------------------------------------------------- */ + static __inline void -ieee80211_get_tkip_p1k_iv(struct ieee80211_key_conf *key, - uint32_t iv32, uint16_t *p1k) +ieee80211_key_mic_failure(struct ieee80211_key_conf *key) +{ + TODO(); +} + +static __inline void +ieee80211_key_replay(struct ieee80211_key_conf *key) +{ + TODO(); +} + +static __inline void +ieee80211_remove_key(struct ieee80211_key_conf *key) { TODO(); } @@ -2431,11 +2405,38 @@ ieee80211_gtk_rekey_notify(struct ieee80211_vif *vif, const uint8_t *bssid, } static __inline void -ieee80211_remove_key(struct ieee80211_key_conf *key) +ieee80211_tkip_add_iv(u8 *crypto_hdr, struct ieee80211_key_conf *keyconf, + uint64_t pn) +{ + TODO(); +} + +static __inline void +ieee80211_get_tkip_rx_p1k(struct ieee80211_key_conf *keyconf, + const u8 *addr, uint32_t iv32, u16 *p1k) +{ + + KASSERT(keyconf != NULL && addr != NULL && p1k != NULL, + ("%s: keyconf %p addr %p p1k %p\n", __func__, keyconf, addr, p1k)); + + TODO(); + memset(p1k, 0xfa, 5 * sizeof(*p1k)); /* Just initializing. */ +} + +static __inline void +ieee80211_get_tkip_p1k_iv(struct ieee80211_key_conf *key, + uint32_t iv32, uint16_t *p1k) { TODO(); } +static __inline void +ieee80211_get_tkip_p2k(struct ieee80211_key_conf *keyconf, + struct sk_buff *skb_frag, u8 *key) +{ + TODO(); +} + static inline void ieee80211_get_key_rx_seq(struct ieee80211_key_conf *keyconf, int8_t tid, struct ieee80211_key_seq *seq) @@ -2481,6 +2482,8 @@ ieee80211_set_key_rx_seq(struct ieee80211_key_conf *key, int tid, TODO(); } +/* -------------------------------------------------------------------------- */ + static __inline void ieee80211_report_wowlan_wakeup(struct ieee80211_vif *vif, struct cfg80211_wowlan_wakeup *wakeup, gfp_t gfp)