diff options
| author |   Kalle Valo <kvalo@codeaurora.org> | 2015-10-28 20:48:26 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-10-28 20:48:26 +0200 |
| commit | b3bcb1b27203c24fbf181748cec6eec10419678d (patch) | |
| tree | a6397d18891460721758501dcd61bfa33011630c /drivers/net/wireless/iwlwifi/mvm/mvm.h | |
| parent | net: hisilicon: updates HNS config and documents (diff) | |
| parent | iwlwifi: nvm: free old section data when reading nvm file (diff) | |
| download | linux-dev-b3bcb1b27203c24fbf181748cec6eec10419678d.tar.xz linux-dev-b3bcb1b27203c24fbf181748cec6eec10419678d.zip | |
Merge tag 'iwlwifi-next-for-kalle-2015-10-25' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
* bug fix for TDLS
* fixes and cleanups in scan
* support of several scan plans
* improvements in FTM
* fixes in FW API
* improvements in the failure paths when the bus is dead
* other various small things here and there
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mvm.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mvm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h index 16c5a6d7e0c9..c6327cd1d071 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h @@ -1036,7 +1036,7 @@ const char *iwl_mvm_get_tx_fail_reason(u32 status); #else static inline const char *iwl_mvm_get_tx_fail_reason(u32 status) { return ""; } #endif -int iwl_mvm_flush_tx_path(struct iwl_mvm *mvm, u32 tfd_msk, bool sync); +int iwl_mvm_flush_tx_path(struct iwl_mvm *mvm, u32 tfd_msk, u32 flags); void iwl_mvm_async_handlers_purge(struct iwl_mvm *mvm); static inline void iwl_mvm_set_tx_cmd_ccmp(struct ieee80211_tx_info *info, |