From nobody Tue Sep 5 21:16:54 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 4RgJGt4lTZz4s1xt; Tue, 5 Sep 2023 21:16:54 +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 4RgJGt42fCz3YyL; Tue, 5 Sep 2023 21:16:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693948614; 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=42sSDJIVxDWstgVgvvU+DCh/+4q+ROudAZQwVQd8phg=; b=bOf1ykprhmmhnEmHMsV3m/KuFlGbHBqBhvzydCV8s04FVIH4nG3JErGdiLEA1gmZ8ZHI51 vDsFWjxnG/sDYbktsJgH/b9YUAq1rgpfzF26dr+/kDSK+ZZwhABuRiU7OI+KmAcWgmUb2E wKkr7eyqt5R1dln6oH+IIbTyLIFfwkevJLIKpfzlUTIu+OATMt2/n0cVoY+IkIazspqM2F FmPsn19/eoTqBTA2vMH4cwItq6dSH/ilrwuPlWbeLQxjmoOWSPTbH685IH8BzRdcIRfjxN wZZgZtulbTFgBZIQiCKWdmY8FGMAco8e0fRTimuv/wfQygaPBE4acA6PonrsiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693948614; a=rsa-sha256; cv=none; b=BXbH7DxHtftsYJKXhiFnPUT5ZLBiA4pWHP8XBkzCMTenJJWlN4M1p6bEG+buhqRKRyUNms 8pl2OjKlYAeWY9g9m2oVwjegrIZh/5MLzSTYAbOVSFUnx3wUFa5oLpOGt2zKHqbA4TBuaW ujs9R1Xw6X/CoR26zyMvXn+Fib4xso9yyUQnp/X2xT6Opm4lGZgKgxbG0J0uDiMyc+KtIk 8aO7Cf2SFBdIagUDzkpyKTWN4Mxy6eeiHSEYYn1fVpl1kw48/0S29HO2B7mUl08n2aBL5W wdpz1IFkbsesJpDOlqqQjQHRh38aGYE72USf1SK6+uTAD5NMvctr2l68WyXT0Q== 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=1693948614; 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=42sSDJIVxDWstgVgvvU+DCh/+4q+ROudAZQwVQd8phg=; b=WAPLPgKVNsD/mMXr6L7t/fDjcV9B0srN8mHdp6xypyDgBzxak99seUjYztiThtnDebskSW WAdIYA2xXmQ6EDfWS9rzKTWvCwX8I7cS5qjCGNkU61MqOVJNJ+thKBHCItO61BAF/9o50H ePa3f2ukK+2YXxTLE2TGaYuLPBAlnvo2f7LDlzJRzjjMhGJBmGtUI0NKZjRpiqACH3VneC 4xtfeFotyltH5kF4A1P1+xp17LJQRkNezjLovjaexkTTXrR1KOhOkRw0A3JixJGl9JgBLH QfWFBipQCpqquxt8lxVneDRz2Ap89ZIixc61/8IAhdlRmqOPxSMW/NtjSNozbQ== 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 4RgJGt31gTzpcS; Tue, 5 Sep 2023 21:16:54 +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 385LGsjA059923; Tue, 5 Sep 2023 21:16:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385LGsbV059920; Tue, 5 Sep 2023 21:16:54 GMT (envelope-from git) Date: Tue, 5 Sep 2023 21:16:54 GMT Message-Id: <202309052116.385LGsbV059920@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: 815b7436a7c6 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 815b7436a7c6302365b6514194d27d41cb736227 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=815b7436a7c6302365b6514194d27d41cb736227 commit 815b7436a7c6302365b6514194d27d41cb736227 Author: Bjoern A. Zeeb AuthorDate: 2023-09-05 18:02:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-05 21:14:25 +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 MFC after: 20 days --- 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,