projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'iwlwifi-next-for-kalle-2015-10-25' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
mvm
/
tx.c
diff --git
a/drivers/net/wireless/iwlwifi/mvm/tx.c
b/drivers/net/wireless/iwlwifi/mvm/tx.c
index
ff8b9bd
..
c652a66
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/mvm/tx.c
+++ b/
drivers/net/wireless/iwlwifi/mvm/tx.c
@@
-1099,7
+1099,7
@@
out:
* 2) flush the Tx path
* 3) wait for the transport queues to be empty
*/
* 2) flush the Tx path
* 3) wait for the transport queues to be empty
*/
-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
)
{
int ret;
struct iwl_tx_path_flush_cmd flush_cmd = {
{
int ret;
struct iwl_tx_path_flush_cmd flush_cmd = {
@@
-1107,8
+1107,6
@@
int iwl_mvm_flush_tx_path(struct iwl_mvm *mvm, u32 tfd_msk, bool sync)
.flush_ctl = cpu_to_le16(DUMP_TX_FIFO_FLUSH),
};
.flush_ctl = cpu_to_le16(DUMP_TX_FIFO_FLUSH),
};
- u32 flags = sync ? 0 : CMD_ASYNC;
-
ret = iwl_mvm_send_cmd_pdu(mvm, TXPATH_FLUSH, flags,
sizeof(flush_cmd), &flush_cmd);
if (ret)
ret = iwl_mvm_send_cmd_pdu(mvm, TXPATH_FLUSH, flags,
sizeof(flush_cmd), &flush_cmd);
if (ret)