evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iwlwifi: rename iwl_fw_error_fw_mon to iwl_fw_error_dump_fw_mon

Browse source 
This is matches the convention of the other structures.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
Emmanuel Grumbach 2014-06-26 09:54:23 +03:00
parent 1e0b393a44
commit c544e9c4c3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
View file

@ -147,14 +147,14 @@ struct iwl_fw_error_dump_info {
} __packed; } __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_wr_ptr: the position of the write pointer in the cyclic buffer
* @fw_mon_base_ptr: base pointer of the data * @fw_mon_base_ptr: base pointer of the data
* @fw_mon_cycle_cnt: number of wrap arounds * @fw_mon_cycle_cnt: number of wrap arounds
* @reserved: for future use * @reserved: for future use
* @data: captured data * @data: captured data
*/ */
struct iwl_fw_error_fw_mon { struct iwl_fw_error_dump_fw_mon {
__le32 fw_mon_wr_ptr; __le32 fw_mon_wr_ptr;
__le32 fw_mon_base_ptr; __le32 fw_mon_base_ptr;
__le32 fw_mon_cycle_cnt; __le32 fw_mon_cycle_cnt;

4
drivers/net/wireless/iwlwifi/pcie/trans.c
View file

@ -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); cmdq->q.n_window * (sizeof(*txcmd) + TFD_MAX_PAYLOAD_SIZE);
if (trans_pcie->fw_mon_page) 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; trans_pcie->fw_mon_size;
if (!buf) if (!buf)
@ -1822,7 +1822,7 @@ static u32 iwl_trans_pcie_dump_data(struct iwl_trans *trans,
len += sizeof(*data); len += sizeof(*data);
if (trans_pcie->fw_mon_page) { 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 = iwl_fw_error_next_data(data);
data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_FW_MONITOR); data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_FW_MONITOR);