summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-06-26 09:54:23 +0300
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-07-06 11:16:16 +0300
commitc544e9c4c32acb222782aeff2f24e55e7497e4bc (patch)
tree5bc9001c27e53e4f92f801f9ee379152f43c9549
parent1e0b393a4478fdce0e39a5b7fe7d05ee4ab46105 (diff)
downloadop-kernel-dev-c544e9c4c32acb222782aeff2f24e55e7497e4bc.zip
op-kernel-dev-c544e9c4c32acb222782aeff2f24e55e7497e4bc.tar.gz
iwlwifi: rename iwl_fw_error_fw_mon to iwl_fw_error_dump_fw_mon
This is matches the convention of the other structures. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h4
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/trans.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h b/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
index 9fd860f..c39a0b8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
@@ -147,14 +147,14 @@ struct iwl_fw_error_dump_info {
} __packed;
/**
- * struct iwl_fw_error_fw_mon - FW monitor data
+ * struct iwl_fw_error_dump_fw_mon - FW monitor data
* @fw_mon_wr_ptr: the position of the write pointer in the cyclic buffer
* @fw_mon_base_ptr: base pointer of the data
* @fw_mon_cycle_cnt: number of wrap arounds
* @reserved: for future use
* @data: captured data
*/
-struct iwl_fw_error_fw_mon {
+struct iwl_fw_error_dump_fw_mon {
__le32 fw_mon_wr_ptr;
__le32 fw_mon_base_ptr;
__le32 fw_mon_cycle_cnt;
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 5703a3d..5b5b0d8 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -1787,7 +1787,7 @@ static u32 iwl_trans_pcie_dump_data(struct iwl_trans *trans,
cmdq->q.n_window * (sizeof(*txcmd) + TFD_MAX_PAYLOAD_SIZE);
if (trans_pcie->fw_mon_page)
- len += sizeof(*data) + sizeof(struct iwl_fw_error_fw_mon) +
+ len += sizeof(*data) + sizeof(struct iwl_fw_error_dump_fw_mon) +
trans_pcie->fw_mon_size;
if (!buf)
@@ -1822,7 +1822,7 @@ static u32 iwl_trans_pcie_dump_data(struct iwl_trans *trans,
len += sizeof(*data);
if (trans_pcie->fw_mon_page) {
- struct iwl_fw_error_fw_mon *fw_mon_data;
+ struct iwl_fw_error_dump_fw_mon *fw_mon_data;
data = iwl_fw_error_next_data(data);
data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_FW_MONITOR);
OpenPOWER on IntegriCloud