From nobody Mon Oct 9 23:16:14 2023 X-Original-To: dev-commits-src-all@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 4S4FJv1Gr7z4wgkP; Mon, 9 Oct 2023 23:16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S4FJt6Y6Rz3QMG; Mon, 9 Oct 2023 23:16:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696893374; 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=O6bm4DYFjD0UHsqrgQUzoCwPJWpGrfRs5Xm6UN7Tmcw=; b=hNyqeQ7/4dXZ4cN6SxdUk1h5xQOFzRSFyFfbEwRvd0e8vpG3As/nj5V717sw/EMFIl2cLd TU7s7lkLhbnl5SBqPgLySB9sA816pXRIJz0LECvK/Ntx8+OYZ5b4a9ceh71jyHPhJ/Oq6K MeCmhaaMyBoX/6buoNTtAWNfSCKShJKpP3gmVDRxtidvKUNoFfG2ss25Ssc0D8JznLxesK /Pe3fJTXtRCFFZaLx9Cr3T6GpO39mOqyGHUA6WZCuw6t5IqlYV0NOo4oFFJSbn8+58i1z3 TdyjrspKfW01VVefJrefbHvvf9qSefi1lkz/s5KlI6/DQS9GDq4YSMZnvHCy+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696893374; a=rsa-sha256; cv=none; b=B9GU3ZOHrK2mz/0VTPTn9LpdW5ryDTRTfyR657y/qup0iZvX1y2luXkhfRupkZbabTiWPr cUg/gmwCp5cxx7w+6VguYhnH6z+FyIgzcQmyAmiK5ztM8+ucCLp+eGVRQ6m7RkNtC8sac0 A+bdBKfzlNwAP2UWuyGLG6Kyly/yEkrupECqiwe1/GbSu+wauRCp7AMf7J95pPq4D1YXKc Jx3oOi+WjbJkzHMgzX8N6dl1qiQ/K44ES/reGZPE27MVXktQl7fhdFi6WoV7XniPtSoT+j e2iok0bJx2+0ya1Nx10/j2UZF5hUu/byjPUGpB0EXZPPK/t3jWQ0Xn5q4gE8SA== 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=1696893374; 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=O6bm4DYFjD0UHsqrgQUzoCwPJWpGrfRs5Xm6UN7Tmcw=; b=lCZm7jwLlaPYT6efSAfIWrTHtxvqbhJAOHQXLmka+JI7aSV6s25mR3YBqnfrGcxyK1opsf 9lGpXIUdZ10adoeipbfTGOOpqgXg2tUdieEtSv5njLzHOFUJrIckBea8sB0rvCgNGugd4C +C5WyU7E22AHGW9jDJsDeK0Ht+DeMFAYObpoYxQhsjzVSbhbKJJvXI9NaPE4Ruu/RWxl7z bRHxh3vlnSIAFFEylps5XXL+W2szSqP4ESYfoJiikVeqti7O7vwRGMetwTUxiFyr0iSUn7 VOyI57Zc1AnR+4N8zK/iE9CaUObrdAuY8eshkr3vQl0Tkf7N8o/WyDdCwqTlXg== 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 4S4FJt5gBpzxm; Mon, 9 Oct 2023 23:16:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 399NGE8N071248; Mon, 9 Oct 2023 23:16:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 399NGEcm071245; Mon, 9 Oct 2023 23:16:14 GMT (envelope-from git) Date: Mon, 9 Oct 2023 23:16:14 GMT Message-Id: <202310092316.399NGEcm071245@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: 8fd6576e0400 - releng/14.0 - LinuxKPI: 802.11: prepare for iwlwifi driver updates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 8fd6576e04002d42b4478b934c27ca9cbff5e0ed Auto-Submitted: auto-generated The branch releng/14.0 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8fd6576e04002d42b4478b934c27ca9cbff5e0ed commit 8fd6576e04002d42b4478b934c27ca9cbff5e0ed Author: Bjoern A. Zeeb AuthorDate: 2023-09-05 18:02:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-09 23:14:53 +0000 LinuxKPI: 802.11: prepare for iwlwifi driver updates Update ieee80211_request_smps() to the new number of arguments in LinuxKPI (which was already prepared) and update the one call in the older iwlwifi driver version. This will allow iwlwifi as-is now and rtw88 to compile in case someone else wants to work on the latter in parallel to predominant efforts on the former. Unconditionally enable the other changes for newer drivers, as needed by iwlwifi (and others). Sponsored by: The FreeBSD Foundation Approved by: re (gjb) (cherry picked from commit 815b7436a7c6302365b6514194d27d41cb736227) (cherry picked from commit 3e1f5cc9a81a6065ddc371eea5755b4e207d72f8) (cherry picked from commit 82782cffead3c757a94a10fe02b202a4dd3b1a04) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 29 +++-------------------- sys/contrib/dev/iwlwifi/mvm/utils.c | 2 +- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index cacf9d652fd0..20371812198a 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -703,12 +703,6 @@ struct ieee80211_sta { struct ieee80211_link_sta deflink; struct ieee80211_link_sta *link[IEEE80211_MLD_MAX_NUM_LINKS]; /* rcu? */ -#ifndef __FOR_LATER_DRV_UPDATE - uint16_t max_rc_amsdu_len; - uint16_t max_amsdu_len; - uint16_t max_tid_amsdu_len[IEEE80211_NUM_TIDS]; -#endif - /* Must stay last. */ uint8_t drv_priv[0] __aligned(CACHE_LINE_SIZE); }; @@ -1421,7 +1415,6 @@ ieee80211_is_back_req(__le16 fc) } static __inline bool -#ifdef __FOR_LATER_DRV_UPDATE ieee80211_is_bufferable_mmpdu(struct sk_buff *skb) { struct ieee80211_mgmt *mgmt; @@ -1429,10 +1422,6 @@ ieee80211_is_bufferable_mmpdu(struct sk_buff *skb) mgmt = (struct ieee80211_mgmt *)skb->data; fc = mgmt->frame_control; -#else -ieee80211_is_bufferable_mmpdu(__le16 fc) -{ -#endif /* 11.2.2 Bufferable MMPDUs, 80211-2020. */ /* XXX we do not care about IBSS yet. */ @@ -2022,10 +2011,7 @@ ieee80211_ie_split(const u8 *ies, size_t ies_len, } static __inline void -ieee80211_request_smps(struct ieee80211_vif *vif, -#ifdef __FOR_LATER_DRV_UPDATE - u_int link_id, -#endif +ieee80211_request_smps(struct ieee80211_vif *vif, u_int link_id, enum ieee80211_smps_mode smps) { static const char *smps_mode_name[] = { @@ -2222,10 +2208,7 @@ ieee80211_tx_dequeue(struct ieee80211_hw *hw, struct ieee80211_txq *txq) static __inline void ieee80211_update_mu_groups(struct ieee80211_vif *vif, -#ifdef __FOR_LATER_DRV_UPDATE - u_int _i, -#endif - uint8_t *ms, uint8_t *up) + u_int _i, uint8_t *ms, uint8_t *up) { TODO(); } @@ -2345,14 +2328,8 @@ ieee80211_proberesp_get(struct ieee80211_hw *hw, struct ieee80211_vif *vif) static __inline struct sk_buff * ieee80211_nullfunc_get(struct ieee80211_hw *hw, struct ieee80211_vif *vif, -#ifdef __FOR_LATER_DRV_UPDATE - int linkid, -#endif - bool qos) + int linkid, bool qos) { -#ifndef __FOR_LATER_DRV_UPDATE - int linkid = 0; -#endif /* Only STA needs this. Otherwise return NULL and panic bad drivers. */ if (vif->type != NL80211_IFTYPE_STATION) diff --git a/sys/contrib/dev/iwlwifi/mvm/utils.c b/sys/contrib/dev/iwlwifi/mvm/utils.c index 075ada8ba356..5370cec8140a 100644 --- a/sys/contrib/dev/iwlwifi/mvm/utils.c +++ b/sys/contrib/dev/iwlwifi/mvm/utils.c @@ -307,7 +307,7 @@ void iwl_mvm_update_smps(struct iwl_mvm *mvm, struct ieee80211_vif *vif, smps_mode = IEEE80211_SMPS_DYNAMIC; } - ieee80211_request_smps(vif, smps_mode); + ieee80211_request_smps(vif, 0, smps_mode); } static bool iwl_wait_stats_complete(struct iwl_notif_wait_data *notif_wait,