diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-04-22 23:01:24 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-04-22 23:01:24 +0400 |
| commit | bf4c69f7dd8e0c3427262cc11652227ec7256a75 (patch) | |
| tree | 7e6fe4f8c3c126496b737962537d51645a826c2c /drivers/net/wireless/iwlwifi/mvm/fw-error-dump.h | |
| parent | 4a0c3d9fd1af83ad0519997043467b817d3738fc (diff) | |
| parent | e03bbb62cfdf539ae8110b297493c685f9d12774 (diff) | |
| download | linux-bf4c69f7dd8e0c3427262cc11652227ec7256a75.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/fw-error-dump.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/fw-error-dump.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-error-dump.h b/drivers/net/wireless/iwlwifi/mvm/fw-error-dump.h index 58c8941c0d95..f381908be7e5 100644 --- a/drivers/net/wireless/iwlwifi/mvm/fw-error-dump.h +++ b/drivers/net/wireless/iwlwifi/mvm/fw-error-dump.h @@ -71,10 +71,12 @@ * enum iwl_fw_error_dump_type - types of data in the dump file * @IWL_FW_ERROR_DUMP_SRAM: * @IWL_FW_ERROR_DUMP_REG: + * @IWL_FW_ERROR_DUMP_RXF: */ enum iwl_fw_error_dump_type { IWL_FW_ERROR_DUMP_SRAM = 0, IWL_FW_ERROR_DUMP_REG = 1, + IWL_FW_ERROR_DUMP_RXF = 2, IWL_FW_ERROR_DUMP_MAX, }; @@ -89,7 +91,7 @@ struct iwl_fw_error_dump_data { __le32 type; __le32 len; __u8 data[]; -} __packed __aligned(4); +} __packed; /** * struct iwl_fw_error_dump_file - the layout of the header of the file @@ -101,6 +103,6 @@ struct iwl_fw_error_dump_file { __le32 barker; __le32 file_len; u8 data[0]; -} __packed __aligned(4); +} __packed; #endif /* __fw_error_dump_h__ */ |