Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

[firefly-linux-kernel-4.4.55.git] / net / mac80211 / trace.h

diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index cec5b60487a4032e2b805df374616ea9ad038669..762e4cd163869e58baedae86751534020ebc0d5c 100644 (file)
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -184,6 +184,20 @@ TRACE_EVENT(drv_return_bool,
                  "true" : "false")
 );
 
+TRACE_EVENT(drv_return_u32,
+       TP_PROTO(struct ieee80211_local *local, u32 ret),
+       TP_ARGS(local, ret),
+       TP_STRUCT__entry(
+               LOCAL_ENTRY
+               __field(u32, ret)
+       ),
+       TP_fast_assign(
+               LOCAL_ASSIGN;
+               __entry->ret = ret;
+       ),
+       TP_printk(LOCAL_PR_FMT " - %u", LOCAL_PR_ARG, __entry->ret)
+);
+
 TRACE_EVENT(drv_return_u64,
        TP_PROTO(struct ieee80211_local *local, u64 ret),
        TP_ARGS(local, ret),
@@ -1499,6 +1513,24 @@ DEFINE_EVENT(local_sdata_evt, drv_leave_ibss,
        TP_ARGS(local, sdata)
 );
 
+TRACE_EVENT(drv_get_expected_throughput,
+       TP_PROTO(struct ieee80211_sta *sta),
+
+       TP_ARGS(sta),
+
+       TP_STRUCT__entry(
+               STA_ENTRY
+       ),
+
+       TP_fast_assign(
+               STA_ASSIGN;
+       ),
+
+       TP_printk(
+               STA_PR_FMT, STA_PR_ARG
+       )
+);
+
 /*
  * Tracing for API calls that drivers call.
  */