diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-devtrace.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-devtrace.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/iwlwifi/iwl-devtrace.h index 9a0f45ec9e01..10f01793d7a6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h +++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h | |||
| @@ -349,25 +349,23 @@ TRACE_EVENT(iwlwifi_dev_rx_data, | |||
| 349 | TRACE_EVENT(iwlwifi_dev_hcmd, | 349 | TRACE_EVENT(iwlwifi_dev_hcmd, |
| 350 | TP_PROTO(const struct device *dev, | 350 | TP_PROTO(const struct device *dev, |
| 351 | struct iwl_host_cmd *cmd, u16 total_size, | 351 | struct iwl_host_cmd *cmd, u16 total_size, |
| 352 | const void *hdr, size_t hdr_len), | 352 | struct iwl_cmd_header *hdr), |
| 353 | TP_ARGS(dev, cmd, total_size, hdr, hdr_len), | 353 | TP_ARGS(dev, cmd, total_size, hdr), |
| 354 | TP_STRUCT__entry( | 354 | TP_STRUCT__entry( |
| 355 | DEV_ENTRY | 355 | DEV_ENTRY |
| 356 | __dynamic_array(u8, hcmd, total_size) | 356 | __dynamic_array(u8, hcmd, total_size) |
| 357 | __field(u32, flags) | 357 | __field(u32, flags) |
| 358 | ), | 358 | ), |
| 359 | TP_fast_assign( | 359 | TP_fast_assign( |
| 360 | int i, offset = hdr_len; | 360 | int i, offset = sizeof(*hdr); |
| 361 | 361 | ||
| 362 | DEV_ASSIGN; | 362 | DEV_ASSIGN; |
| 363 | __entry->flags = cmd->flags; | 363 | __entry->flags = cmd->flags; |
| 364 | memcpy(__get_dynamic_array(hcmd), hdr, hdr_len); | 364 | memcpy(__get_dynamic_array(hcmd), hdr, sizeof(*hdr)); |
| 365 | 365 | ||
| 366 | for (i = 0; i < IWL_MAX_CMD_TFDS; i++) { | 366 | for (i = 0; i < IWL_MAX_CMD_TFDS; i++) { |
| 367 | if (!cmd->len[i]) | 367 | if (!cmd->len[i]) |
| 368 | continue; | 368 | continue; |
| 369 | if (!(cmd->dataflags[i] & IWL_HCMD_DFL_NOCOPY)) | ||
| 370 | continue; | ||
| 371 | memcpy((u8 *)__get_dynamic_array(hcmd) + offset, | 369 | memcpy((u8 *)__get_dynamic_array(hcmd) + offset, |
| 372 | cmd->data[i], cmd->len[i]); | 370 | cmd->data[i], cmd->len[i]); |
| 373 | offset += cmd->len[i]; | 371 | offset += cmd->len[i]; |
