Merge tag 'sound-fix-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux.git] / net / mac80211 / trace.h

diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index 588c51a67c895e7005cc0f853d2b3a0e0b31c488..35ea0dcb55e6155269c1bd669bb0f8d4d585d086 100644 (file)
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -1052,10 +1052,10 @@ TRACE_EVENT(drv_ampdu_action,
 );
 
 TRACE_EVENT(drv_get_survey,
-       TP_PROTO(struct ieee80211_local *local, int idx,
+       TP_PROTO(struct ieee80211_local *local, int _idx,
                 struct survey_info *survey),
 
-       TP_ARGS(local, idx, survey),
+       TP_ARGS(local, _idx, survey),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
@@ -1064,7 +1064,7 @@ TRACE_EVENT(drv_get_survey,
 
        TP_fast_assign(
                LOCAL_ASSIGN;
-               __entry->idx = idx;
+               __entry->idx = _idx;
        ),
 
        TP_printk(
@@ -1882,6 +1882,18 @@ TRACE_EVENT(drv_del_nan_func,
        )
 );
 
+DEFINE_EVENT(local_sdata_evt, drv_start_pmsr,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata),
+       TP_ARGS(local, sdata)
+);
+
+DEFINE_EVENT(local_sdata_evt, drv_abort_pmsr,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata),
+       TP_ARGS(local, sdata)
+);
+
 /*
  * Tracing for API calls that drivers call.
  */