From nobody Wed Nov 29 16:38:08 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 4SgQ414X7sz52wsT; Wed, 29 Nov 2023 16:38:09 +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 4SgQ411Rfwz3HPS; Wed, 29 Nov 2023 16:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275889; 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=9rViG3tM89ZjsyLtlcZVsqICE2VXac8l0u3pOeDlgco=; b=n/6zOBd3dpMN2fxb+GIJF37PuAYp0OiB3Qld5bscK6O56TfqGKWI6XVUmNRnT6xm/t9qax riNRVKDcQRwKvkn6BumHsN76ys/9HVfob/FEzHWZpXq4B2T+jGMvK6qMUVaEprfsJXUMSO EC8leeZqOYSsEFr64AY/rHEgMQtGnSVXO19KTZznLd7rbuiJ81iiT/z3BIlH/xO82klhgz 7ytZINB1p2fonkqCtGj72/DI2SKl+YiJ7FFSx4uj3SpZ7DrSsQXRnykrfRCbHaRXQhz/wU RAVHEYEgleV+x9SfZARI0B9hK/IH8FnOa81Orj3vRA4RQqxPpcppafMXUsM9Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275889; 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=9rViG3tM89ZjsyLtlcZVsqICE2VXac8l0u3pOeDlgco=; b=gRkBgAcuzXLS7HBeLutvzmc9DIwLun1ljGqL4jIHxaKTS28m72kl8PBNqUbTfFktzQfzEC b7LtCAvo6wV0fUgWEMGpaX5Wwl3670rke+cSerOl+Ed6EbVauxbt5W3rUisiYaQhqNcdo0 1D/0OoeSWZ5/8j+iSYCIF7jqMsCLmXGPjsr5XMKjtd+O1UqgPO3MqL/RYgossTjYoMlR33 +ujImiJVsS7L4Gxdtt/wrPyPGW9zTV7LIWGcQtT7wweh0BBLZRh+pahfPQmnfPWU7gHjKt 1Xw0J/rDEU7jatK23ta8fZAHEFjZUekUGWFHQLv2Abu5h+LebLxihsx4T7jbCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275889; a=rsa-sha256; cv=none; b=kJ4V3lq7Ldc4tpbG79mV9fSPQ5s7xDBLBPb18KJtOuKSg1YA6aP8Yv0zlZvB7TaELp7Kmc XumZq463ZsmdjewVIsi/9tPvE1vT+lcdIs/D4M7H1eCajg5+UkqBzVNaG5Aa/jnyaMhoGx NkSh/pIFpxBoOxx3+pYstAGdj0QiB1ov65qMVPvEBFV6oXjVT4WFjARslRd9ds/Hukamd6 N3hkFeXvhXwu0vgyogTx9vQ9/q42geLL7c7yvfCOeAjBgwhvdtwIEWe7wIoSzOiwdQTOGz +pELfBnj18rBMPW1TZM+MohL3zN2EsZJeIp8c0ZO9cwOcIFFy5XpnMtX7UFdCw== 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 4SgQ410Yk5z1CXj; Wed, 29 Nov 2023 16:38:09 +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 3ATGc8eJ045052; Wed, 29 Nov 2023 16:38:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGc8tE045049; Wed, 29 Nov 2023 16:38:08 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:08 GMT Message-Id: <202311291638.3ATGc8tE045049@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: fb9c182f5ea4 - stable/13 - iwlwifi/LinuxKPI: 802.11: update ieee80211_request_smps() 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/stable/13 X-Git-Reftype: branch X-Git-Commit: fb9c182f5ea42ad0c6f839dc894130f5268a938a Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fb9c182f5ea42ad0c6f839dc894130f5268a938a commit fb9c182f5ea42ad0c6f839dc894130f5268a938a Author: Bjoern A. Zeeb AuthorDate: 2023-09-05 18:02:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:05 +0000 iwlwifi/LinuxKPI: 802.11: update ieee80211_request_smps() 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. Sponsored by: The FreeBSD Foundation (cherry picked from commit 815b7436a7c6302365b6514194d27d41cb736227) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 13 ++----------- sys/contrib/dev/iwlwifi/mvm/utils.c | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index cacf9d652fd0..bc7f22f5aa15 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -2022,10 +2022,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[] = { @@ -2345,14 +2342,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,