Merge branch 'iwlwifi-fixes' into iwlwifi-next

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / iwlwifi / mvm / debugfs.c

diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
index 82c09d86af8c055d5fdda608756d094905898a8f..8c5229892e573aa58234e4e64893ddee0c89253e 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
@@ -562,11 +562,12 @@ static ssize_t iwl_dbgfs_bt_cmd_read(struct file *file, char __user *user_buf,
                               "\tSecondary Channel Bitmap 0x%016llx\n",
                               le64_to_cpu(cmd->bt_secondary_ci));
 
-               pos += scnprintf(buf+pos, bufsz-pos, "BT Configuration CMD\n");
-               pos += scnprintf(buf+pos, bufsz-pos, "\tACK Kill Mask 0x%08x\n",
-                                iwl_bt_ctl_kill_msk[mvm->bt_ack_kill_msk[0]]);
-               pos += scnprintf(buf+pos, bufsz-pos, "\tCTS Kill Mask 0x%08x\n",
-                                iwl_bt_ctl_kill_msk[mvm->bt_cts_kill_msk[0]]);
+               pos += scnprintf(buf+pos, bufsz-pos,
+                                "BT Configuration CMD - 0=default, 1=never, 2=always\n");
+               pos += scnprintf(buf+pos, bufsz-pos, "\tACK Kill msk idx %d\n",
+                                mvm->bt_ack_kill_msk[0]);
+               pos += scnprintf(buf+pos, bufsz-pos, "\tCTS Kill msk idx %d\n",
+                                mvm->bt_cts_kill_msk[0]);
 
        } else {
                struct iwl_bt_coex_ci_cmd *cmd = &mvm->last_bt_ci_cmd;
@@ -579,21 +580,6 @@ static ssize_t iwl_dbgfs_bt_cmd_read(struct file *file, char __user *user_buf,
                pos += scnprintf(buf+pos, bufsz-pos,
                               "\tSecondary Channel Bitmap 0x%016llx\n",
                               le64_to_cpu(cmd->bt_secondary_ci));
-
-               pos += scnprintf(buf+pos, bufsz-pos, "BT Configuration CMD\n");
-               pos += scnprintf(buf+pos, bufsz-pos,
-                                "\tPrimary: ACK Kill Mask 0x%08x\n",
-                                iwl_bt_ctl_kill_msk[mvm->bt_ack_kill_msk[0]]);
-               pos += scnprintf(buf+pos, bufsz-pos,
-                                "\tPrimary: CTS Kill Mask 0x%08x\n",
-                                iwl_bt_ctl_kill_msk[mvm->bt_cts_kill_msk[0]]);
-               pos += scnprintf(buf+pos, bufsz-pos,
-                                "\tSecondary: ACK Kill Mask 0x%08x\n",
-                                iwl_bt_ctl_kill_msk[mvm->bt_ack_kill_msk[1]]);
-               pos += scnprintf(buf+pos, bufsz-pos,
-                                "\tSecondary: CTS Kill Mask 0x%08x\n",
-                                iwl_bt_ctl_kill_msk[mvm->bt_cts_kill_msk[1]]);
-
        }
 
        mutex_unlock(&mvm->mutex);
@@ -942,7 +928,7 @@ static ssize_t iwl_dbgfs_fw_dbg_conf_read(struct file *file,
                                          size_t count, loff_t *ppos)
 {
        struct iwl_mvm *mvm = file->private_data;
-       enum iwl_fw_dbg_conf conf;
+       int conf;
        char buf[8];
        const size_t bufsz = sizeof(buf);
        int pos = 0;
@@ -966,7 +952,7 @@ static ssize_t iwl_dbgfs_fw_dbg_conf_write(struct iwl_mvm *mvm,
        if (ret)
                return ret;
 
-       if (WARN_ON(conf_id >= FW_DBG_MAX))
+       if (WARN_ON(conf_id >= FW_DBG_CONF_MAX))
                return -EINVAL;
 
        mutex_lock(&mvm->mutex);
@@ -985,7 +971,7 @@ static ssize_t iwl_dbgfs_fw_dbg_collect_write(struct iwl_mvm *mvm,
        if (ret)
                return ret;
 
-       iwl_mvm_fw_dbg_collect(mvm);
+       iwl_mvm_fw_dbg_collect(mvm, FW_DBG_TRIGGER_USER, NULL, 0, 0);
 
        iwl_mvm_unref(mvm, IWL_MVM_REF_PRPH_WRITE);