git: 815b7436a7c6 - main - iwlwifi/LinuxKPI: 802.11: update ieee80211_request_smps()

The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=815b7436a7c6302365b6514194d27d41cb736227

commit 815b7436a7c6302365b6514194d27d41cb736227
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2023-09-05 18:02:02 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
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,