aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/utils.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-05-16 14:16:17 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-05-16 14:16:17 -0400
commitd91a48cbae4cc12f6e8a65372a73ecf46f8f1b7f (patch)
tree3b5e1c94e6aca1d132491ade8d033733ab06e328 /drivers/net/wireless/iwlwifi/mvm/utils.c
parent75e58071c0c64f331ccc4c0037990a1e50099f7f (diff)
parentaf7c603eb476216f1c27d82b802f0ce879c54ab3 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/utils.c')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/utils.c b/drivers/net/wireless/iwlwifi/mvm/utils.c
index 2f82d0dc7ad8..5834873aefe1 100644
--- a/drivers/net/wireless/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/iwlwifi/mvm/utils.c
@@ -144,7 +144,7 @@ int iwl_mvm_send_cmd_status(struct iwl_mvm *mvm, struct iwl_host_cmd *cmd,
144 "cmd flags %x", cmd->flags)) 144 "cmd flags %x", cmd->flags))
145 return -EINVAL; 145 return -EINVAL;
146 146
147 cmd->flags |= CMD_SYNC | CMD_WANT_SKB; 147 cmd->flags |= CMD_WANT_SKB;
148 148
149 ret = iwl_trans_send_cmd(mvm->trans, cmd); 149 ret = iwl_trans_send_cmd(mvm->trans, cmd);
150 if (ret == -ERFKILL) { 150 if (ret == -ERFKILL) {
@@ -599,7 +599,7 @@ int iwl_mvm_send_lq_cmd(struct iwl_mvm *mvm, struct iwl_lq_cmd *lq, bool init)
599 struct iwl_host_cmd cmd = { 599 struct iwl_host_cmd cmd = {
600 .id = LQ_CMD, 600 .id = LQ_CMD,
601 .len = { sizeof(struct iwl_lq_cmd), }, 601 .len = { sizeof(struct iwl_lq_cmd), },
602 .flags = init ? CMD_SYNC : CMD_ASYNC, 602 .flags = init ? 0 : CMD_ASYNC,
603 .data = { lq, }, 603 .data = { lq, },
604 }; 604 };
605 605