Merge tag 'mlx5-updates-2017-06-16' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / net / mac80211 / trace.h

diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index 92a47afaa989e6b63b494eacc23c56409f767642..3d9ac17af407a12c4230a1df26f770bd0bd1ab39 100644 (file)
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -92,16 +92,19 @@
                                __field(u16, ssn)                                       \
                                __field(u8, buf_size)                                   \
                                __field(bool, amsdu)                                    \
-                               __field(u16, timeout)
+                               __field(u16, timeout)                                   \
+                               __field(u16, action)
 #define AMPDU_ACTION_ASSIGN    STA_NAMED_ASSIGN(params->sta);                          \
                                __entry->tid = params->tid;                             \
                                __entry->ssn = params->ssn;                             \
                                __entry->buf_size = params->buf_size;                   \
                                __entry->amsdu = params->amsdu;                         \
-                               __entry->timeout = params->timeout;
-#define AMPDU_ACTION_PR_FMT    STA_PR_FMT " tid %d, ssn %d, buf_size %u, amsdu %d, timeout %d"
+                               __entry->timeout = params->timeout;                     \
+                               __entry->action = params->action;
+#define AMPDU_ACTION_PR_FMT    STA_PR_FMT " tid %d, ssn %d, buf_size %u, amsdu %d, timeout %d action %d"
 #define AMPDU_ACTION_PR_ARG    STA_PR_ARG, __entry->tid, __entry->ssn,                 \
-                               __entry->buf_size, __entry->amsdu, __entry->timeout
+                               __entry->buf_size, __entry->amsdu, __entry->timeout,    \
+                               __entry->action
 
 /*
  * Tracing for driver callbacks.
@@ -1736,21 +1739,21 @@ TRACE_EVENT(drv_start_nan,
                LOCAL_ENTRY
                VIF_ENTRY
                __field(u8, master_pref)
-               __field(u8, dual)
+               __field(u8, bands)
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
                VIF_ASSIGN;
                __entry->master_pref = conf->master_pref;
-               __entry->dual = conf->dual;
+               __entry->bands = conf->bands;
        ),
 
        TP_printk(
                LOCAL_PR_FMT  VIF_PR_FMT
-               ", master preference: %u, dual: %d",
+               ", master preference: %u, bands: 0x%0x",
                LOCAL_PR_ARG, VIF_PR_ARG, __entry->master_pref,
-               __entry->dual
+               __entry->bands
        )
 );
 
@@ -1787,7 +1790,7 @@ TRACE_EVENT(drv_nan_change_conf,
                LOCAL_ENTRY
                VIF_ENTRY
                __field(u8, master_pref)
-               __field(u8, dual)
+               __field(u8, bands)
                __field(u32, changes)
        ),
 
@@ -1795,15 +1798,15 @@ TRACE_EVENT(drv_nan_change_conf,
                LOCAL_ASSIGN;
                VIF_ASSIGN;
                __entry->master_pref = conf->master_pref;
-               __entry->dual = conf->dual;
+               __entry->bands = conf->bands;
                __entry->changes = changes;
        ),
 
        TP_printk(
                LOCAL_PR_FMT  VIF_PR_FMT
-               ", master preference: %u, dual: %d, changes: 0x%x",
+               ", master preference: %u, bands: 0x%0x, changes: 0x%x",
                LOCAL_PR_ARG, VIF_PR_ARG, __entry->master_pref,
-               __entry->dual, __entry->changes
+               __entry->bands, __entry->changes
        )
 );
 
@@ -1996,23 +1999,26 @@ TRACE_EVENT(api_connection_loss,
 
 TRACE_EVENT(api_cqm_rssi_notify,
        TP_PROTO(struct ieee80211_sub_if_data *sdata,
-                enum nl80211_cqm_rssi_threshold_event rssi_event),
+                enum nl80211_cqm_rssi_threshold_event rssi_event,
+                s32 rssi_level),
 
-       TP_ARGS(sdata, rssi_event),
+       TP_ARGS(sdata, rssi_event, rssi_level),
 
        TP_STRUCT__entry(
                VIF_ENTRY
                __field(u32, rssi_event)
+               __field(s32, rssi_level)
        ),
 
        TP_fast_assign(
                VIF_ASSIGN;
                __entry->rssi_event = rssi_event;
+               __entry->rssi_level = rssi_level;
        ),
 
        TP_printk(
-               VIF_PR_FMT " event:%d",
-               VIF_PR_ARG, __entry->rssi_event
+               VIF_PR_FMT " event:%d rssi:%d",
+               VIF_PR_ARG, __entry->rssi_event, __entry->rssi_level
        )
 );