diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-08 15:03:11 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-08 15:03:11 +0100 |
| commit | c76b305c237d013d83e2e75e88b0b2bd427b4b69 (patch) | |
| tree | 9f5a04fab04cff3ce5ffdfc8ac60583842ac75ba /drivers/net/wireless/intel/iwlwifi/mvm/time-event.h | |
| parent | 2696e1146d3490f1af4b0080955bf1628bd8ab85 (diff) | |
| parent | d08f3010f4a32eec3c8aa771f03a1b342a1472fa (diff) | |
| download | talos-op-linux-c76b305c237d013d83e2e75e88b0b2bd427b4b69.tar.gz talos-op-linux-c76b305c237d013d83e2e75e88b0b2bd427b4b69.zip | |
Merge tag 'wireless-drivers-2020-02-08' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says:
====================
wireless-drivers fixes for v5.6
First set of fixes for v5.6. Buffer overflow fixes to mwifiex, quite a
few functionality fixes to iwlwifi and smaller fixes to other drivers.
mwifiex
* fix an unlock from a previous security fix
* fix two buffer overflows
libertas
* fix two bugs from previous security fixes
iwlwifi
* fix module removal with multiple NICs
* don't treat IGTK removal failure as an error
* avoid FW crashes due to DTS measurement races
* fix a potential use after free in FTM code
* prevent a NULL pointer dereference in iwl_mvm_cfg_he_sta()
* fix TDLS discovery
* check all CPUs when trying to detect an error during resume
rtw88
* fix clang warning
mt76
* fix reading of max_nss value from a register
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/time-event.h')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/time-event.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/time-event.h b/drivers/net/wireless/intel/iwlwifi/mvm/time-event.h index df6832b79666..3186d7e40567 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/time-event.h +++ b/drivers/net/wireless/intel/iwlwifi/mvm/time-event.h @@ -250,10 +250,12 @@ iwl_mvm_te_scheduled(struct iwl_mvm_time_event_data *te_data) * @mvm: the mvm component * @vif: the virtual interface for which the protection issued * @duration: the duration of the protection + * @wait_for_notif: if true, will block until the start of the protection */ void iwl_mvm_schedule_session_protection(struct iwl_mvm *mvm, struct ieee80211_vif *vif, - u32 duration, u32 min_duration); + u32 duration, u32 min_duration, + bool wait_for_notif); /** * iwl_mvm_rx_session_protect_notif - handles %SESSION_PROTECTION_NOTIF |
