These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / ieee802154 / trace.h

diff --git a/kernel/net/ieee802154/trace.h b/kernel/net/ieee802154/trace.h
index 5ac25eb..9a471e4 100644 (file)
--- a/kernel/net/ieee802154/trace.h
+++ b/kernel/net/ieee802154/trace.h
@@ -1,4 +1,4 @@
-/* Based on net/wireless/tracing.h */
+/* Based on net/wireless/trace.h */
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM cfg802154
@@ -40,6 +40,28 @@
  *                     rdev->ops traces                     *
  *************************************************************/
 
+DECLARE_EVENT_CLASS(wpan_phy_only_evt,
+       TP_PROTO(struct wpan_phy *wpan_phy),
+       TP_ARGS(wpan_phy),
+       TP_STRUCT__entry(
+               WPAN_PHY_ENTRY
+       ),
+       TP_fast_assign(
+               WPAN_PHY_ASSIGN;
+       ),
+       TP_printk(WPAN_PHY_PR_FMT, WPAN_PHY_PR_ARG)
+);
+
+DEFINE_EVENT(wpan_phy_only_evt, 802154_rdev_suspend,
+       TP_PROTO(struct wpan_phy *wpan_phy),
+       TP_ARGS(wpan_phy)
+);
+
+DEFINE_EVENT(wpan_phy_only_evt, 802154_rdev_resume,
+       TP_PROTO(struct wpan_phy *wpan_phy),
+       TP_ARGS(wpan_phy)
+);
+
 TRACE_EVENT(802154_rdev_add_virtual_intf,
        TP_PROTO(struct wpan_phy *wpan_phy, char *name,
                 enum nl802154_iftype type, __le64 extended_addr),
@@ -56,7 +78,7 @@ TRACE_EVENT(802154_rdev_add_virtual_intf,
                __entry->type = type;
                __entry->extended_addr = extended_addr;
        ),
-       TP_printk(WPAN_PHY_PR_FMT ", virtual intf name: %s, type: %d, ea %llx",
+       TP_printk(WPAN_PHY_PR_FMT ", virtual intf name: %s, type: %d, extended addr: 0x%llx",
                  WPAN_PHY_PR_ARG, __get_str(vir_intf_name), __entry->type,
                  __le64_to_cpu(__entry->extended_addr))
 );
@@ -93,6 +115,21 @@ TRACE_EVENT(802154_rdev_set_channel,
                  __entry->page, __entry->channel)
 );
 
+TRACE_EVENT(802154_rdev_set_tx_power,
+       TP_PROTO(struct wpan_phy *wpan_phy, s32 power),
+       TP_ARGS(wpan_phy, power),
+       TP_STRUCT__entry(
+               WPAN_PHY_ENTRY
+               __field(s32, power)
+       ),
+       TP_fast_assign(
+               WPAN_PHY_ASSIGN;
+               __entry->power = power;
+       ),
+       TP_printk(WPAN_PHY_PR_FMT ", mbm: %d", WPAN_PHY_PR_ARG,
+                 __entry->power)
+);
+
 TRACE_EVENT(802154_rdev_set_cca_mode,
        TP_PROTO(struct wpan_phy *wpan_phy, const struct wpan_phy_cca *cca),
        TP_ARGS(wpan_phy, cca),
@@ -108,6 +145,21 @@ TRACE_EVENT(802154_rdev_set_cca_mode,
                  WPAN_CCA_PR_ARG)
 );
 
+TRACE_EVENT(802154_rdev_set_cca_ed_level,
+       TP_PROTO(struct wpan_phy *wpan_phy, s32 ed_level),
+       TP_ARGS(wpan_phy, ed_level),
+       TP_STRUCT__entry(
+               WPAN_PHY_ENTRY
+               __field(s32, ed_level)
+       ),
+       TP_fast_assign(
+               WPAN_PHY_ASSIGN;
+               __entry->ed_level = ed_level;
+       ),
+       TP_printk(WPAN_PHY_PR_FMT ", ed level: %d", WPAN_PHY_PR_ARG,
+                 __entry->ed_level)
+);
+
 DECLARE_EVENT_CLASS(802154_le16_template,
        TP_PROTO(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,
                 __le16 le16arg),
@@ -137,7 +189,7 @@ DEFINE_EVENT_PRINT(802154_le16_template, 802154_rdev_set_short_addr,
        TP_PROTO(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,
                 __le16 le16arg),
        TP_ARGS(wpan_phy, wpan_dev, le16arg),
-       TP_printk(WPAN_PHY_PR_FMT ", " WPAN_DEV_PR_FMT ", sa: 0x%04x",
+       TP_printk(WPAN_PHY_PR_FMT ", " WPAN_DEV_PR_FMT ", short addr: 0x%04x",
                  WPAN_PHY_PR_ARG, WPAN_DEV_PR_ARG,
                  __le16_to_cpu(__entry->le16arg))
 );
@@ -160,7 +212,7 @@ TRACE_EVENT(802154_rdev_set_backoff_exponent,
        ),
 
        TP_printk(WPAN_PHY_PR_FMT ", " WPAN_DEV_PR_FMT
-                 ", min be: %d, max_be: %d", WPAN_PHY_PR_ARG,
+                 ", min be: %d, max be: %d", WPAN_PHY_PR_ARG,
                  WPAN_DEV_PR_ARG, __entry->min_be, __entry->max_be)
 );
 
@@ -223,6 +275,25 @@ TRACE_EVENT(802154_rdev_set_lbt_mode,
                WPAN_DEV_PR_ARG, BOOL_TO_STR(__entry->mode))
 );
 
+TRACE_EVENT(802154_rdev_set_ackreq_default,
+       TP_PROTO(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,
+                bool ackreq),
+       TP_ARGS(wpan_phy, wpan_dev, ackreq),
+       TP_STRUCT__entry(
+               WPAN_PHY_ENTRY
+               WPAN_DEV_ENTRY
+               __field(bool, ackreq)
+       ),
+       TP_fast_assign(
+               WPAN_PHY_ASSIGN;
+               WPAN_DEV_ASSIGN;
+               __entry->ackreq = ackreq;
+       ),
+       TP_printk(WPAN_PHY_PR_FMT ", " WPAN_DEV_PR_FMT
+               ", ackreq default: %s", WPAN_PHY_PR_ARG,
+               WPAN_DEV_PR_ARG, BOOL_TO_STR(__entry->ackreq))
+);
+
 TRACE_EVENT(802154_rdev_return_int,
        TP_PROTO(struct wpan_phy *wpan_phy, int ret),
        TP_ARGS(wpan_phy, ret),