From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 27 Jun 2024 20:53:43 +0000 (-0700)
Subject: Merge tag 'wireless-next-2024-06-27' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.11-rc1~163^2~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56bf02c26a362a270c7f12f1e36aeced95bc2287;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'wireless-next-2024-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

Johannes Berg says:

====================
Highlights this time are:

 - cfg80211/nl80211:
    * improvements for 6 GHz regulatory flexibility

 - mac80211:
    * use generic netdev stats
    * multi-link improvements/fixes

 - brcmfmac:
    * MFP support (to enable WPA3)

 - wilc1000:
    * suspend/resume improvements

 - iwlwifi:
    * remove support for older FW for new devices
    * fast resume (keeping the device configured)

 - wl18xx:
    * support newer firmware versions

* tag 'wireless-next-2024-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (100 commits)
  wifi: brcmfmac: of: Support interrupts-extended
  wifi: brcmsmac: advertise MFP_CAPABLE to enable WPA3
  net: rfkill: Correct return value in invalid parameter case
  wifi: mac80211: fix NULL dereference at band check in starting tx ba session
  wifi: iwlwifi: mvm: fix rs.h kernel-doc
  wifi: iwlwifi: fw: api: datapath: fix kernel-doc
  wifi: iwlwifi: fix remaining mistagged kernel-doc comments
  wifi: iwlwifi: fix prototype mismatch kernel-doc warnings
  wifi: iwlwifi: fix kernel-doc in iwl-fh.h
  wifi: iwlwifi: fix kernel-doc in iwl-trans.h
  wifi: iwlwifi: pcie: fix kernel-doc
  wifi: iwlwifi: dvm: fix kernel-doc warnings
  wifi: iwlwifi: mvm: don't log error for failed UATS table read
  wifi: iwlwifi: trans: make bad state warnings
  wifi: iwlwifi: fw: api: fix some kernel-doc
  wifi: iwlwifi: mvm: remove init_dbg module parameter
  wifi: iwlwifi: update the BA notification API
  wifi: iwlwifi: mvm: always unblock EMLSR on ROC end
  wifi: iwlwifi: mvm: use IWL_FW_CHECK for link ID check
  wifi: iwlwifi: mvm: don't flush BSSes on restart with MLD API
  ...
====================

Link: https://patch.msgid.link/20240627114135.28507-3-johannes@sipsolutions.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

56bf02c26a362a270c7f12f1e36aeced95bc2287
diff --cc drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
index 31bc80cdcb7d5,98490866a7f56..2773dfa8baa93
--- a/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
@@@ -1238,10 -1293,8 +1293,9 @@@ void iwl_mvm_stop_roc(struct iwl_mvm *m
  			if (te_data->id >= SESSION_PROTECT_CONF_MAX_ID) {
  				IWL_DEBUG_TE(mvm,
  					     "No remain on channel event\n");
 +				mutex_unlock(&mvm->mutex);
  				return;
  			}
- 
  			iwl_mvm_cancel_session_protection(mvm, vif,
  							  te_data->id,
  							  te_data->link_id);
diff --cc net/mac80211/util.c
index d7c45b098be91,610f0a94796c0..c6d5f73119d86
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@@ -1565,11 -1565,9 +1565,11 @@@ u32 ieee80211_sta_get_rates(struct ieee
  	return supp_rates;
  }
  
- void ieee80211_stop_device(struct ieee80211_local *local)
+ void ieee80211_stop_device(struct ieee80211_local *local, bool suspend)
  {
 +	local_bh_disable();
  	ieee80211_handle_queued_frames(local);
 +	local_bh_enable();
  
  	ieee80211_led_radio(local, false);
  	ieee80211_mod_tpt_led_trig(local, 0, IEEE80211_TPT_LEDTRIG_FL_RADIO);