iwlwifi: dbg_ini: add region id to the region dump

Add the region id of the collected memory to the header of the memory
region.

Signed-off-by: Shahar S Matityahu <shahar.s.matityahu@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index 81ce8a46ff119758565557e0b11aad297b74de81..a014fb729f48d179f5113b230e3604a815a7c708 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -1606,6 +1606,7 @@ iwl_dump_ini_mem(struct iwl_fw_runtime *fwrt,
        (*data)->type = cpu_to_le32(type | INI_DUMP_BIT);
        (*data)->len = cpu_to_le32(ops->get_size(fwrt, reg));
 
+       header->region_id = reg->region_id;
        header->num_of_ranges = cpu_to_le32(num_of_ranges);
        header->name_len = cpu_to_le32(min_t(int, IWL_FW_INI_MAX_NAME,
                                             le32_to_cpu(reg->name_len)));

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h b/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h
index a2339021153ff5b4a56e510dcf3097d2c7ca02f4..ac2589bfedb2864f500b99ed257d3f022c4a0cfb 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h
@@ -297,12 +297,14 @@ struct iwl_fw_ini_error_dump_range {
 /**
  * struct iwl_fw_ini_error_dump_header - ini region dump header
  * @version: dump version
+ * @region_id: id of the region
  * @num_of_ranges: number of ranges in this region
  * @name_len: number of bytes allocated to the name string of this region
  * @name: name of the region
  */
 struct iwl_fw_ini_error_dump_header {
        __le32 version;
+       __le32 region_id;
        __le32 num_of_ranges;
        __le32 name_len;
        u8 name[IWL_FW_INI_MAX_NAME];