wifi: iwlwifi: simplify TX tracing

There's no need to calculate again whether data should
be included or be handled externally, just check if any
space for it was already reserved.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240512152312.a3d3b4796460.I85bd3029baee24ebf0be04db7d6bf01834090869@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h
index 2c280a2fe3df323cd3ee3b7bdd49bd469300e883..0d4a0896a2c51b0efad624329bc8514bbffcd9f9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h
@@ -3,7 +3,7 @@
  *
  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2015        Intel Deutschland GmbH
- * Copyright(c) 2018 - 2019, 2023 Intel Corporation
+ * Copyright(c) 2018 - 2019, 2023-2024 Intel Corporation
  *****************************************************************************/
 
 #if !defined(__IWLWIFI_DEVICE_TRACE_DATA) || defined(TRACE_HEADER_MULTI_READ)
@@ -28,7 +28,7 @@ TRACE_EVENT(iwlwifi_dev_tx_tb,
        TP_fast_assign(
                DEV_ASSIGN;
                __entry->phys = phys;
-               if (iwl_trace_data(skb))
+               if (__get_dynamic_array_len(data))
                        memcpy(__get_dynamic_array(data), data_src, data_len);
        ),
        TP_printk("[%s] TX frame data", __get_str(dev))

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h
index b9aa04cf1d8335da6c3f1039ae6b3966353a831a..ead72c3d33bdf02dd5bfef62e9284dc78777e600 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h
@@ -99,7 +99,7 @@ TRACE_EVENT(iwlwifi_dev_tx,
                        __entry->framelen += skb->len - hdr_len;
                memcpy(__get_dynamic_array(tfd), tfd, tfdlen);
                memcpy(__get_dynamic_array(buf0), buf0, buf0_len);
-               if (hdr_len > 0 && !iwl_trace_data(skb))
+               if (__get_dynamic_array_len(buf1))
                        skb_copy_bits(skb, hdr_len,
                                      __get_dynamic_array(buf1),
                                      skb->len - hdr_len);