1 files changed, 36 insertions, 4 deletions

diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index 6f14591d8ca9..314e3bd7fbdb 100644
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -497,6 +497,36 @@ TRACE_EVENT(drv_configure_filter,
         )
 );
 
+TRACE_EVENT(drv_config_iface_filter,
+        TP_PROTO(struct ieee80211_local *local,
+                 struct ieee80211_sub_if_data *sdata,
+                 unsigned int filter_flags,
+                 unsigned int changed_flags),
+
+        TP_ARGS(local, sdata, filter_flags, changed_flags),
+
+        TP_STRUCT__entry(
+                LOCAL_ENTRY
+                VIF_ENTRY
+                __field(unsigned int, filter_flags)
+                __field(unsigned int, changed_flags)
+        ),
+
+        TP_fast_assign(
+                LOCAL_ASSIGN;
+                VIF_ASSIGN;
+                __entry->filter_flags = filter_flags;
+                __entry->changed_flags = changed_flags;
+        ),
+
+        TP_printk(
+                LOCAL_PR_FMT VIF_PR_FMT
+                " filter_flags: %#x changed_flags: %#x",
+                LOCAL_PR_ARG, VIF_PR_ARG, __entry->filter_flags,
+                __entry->changed_flags
+        )
+);
+
 TRACE_EVENT(drv_set_tim,
         TP_PROTO(struct ieee80211_local *local,
                  struct ieee80211_sta *sta, bool set),
@@ -944,9 +974,9 @@ TRACE_EVENT(drv_ampdu_action,
                  struct ieee80211_sub_if_data *sdata,
                  enum ieee80211_ampdu_mlme_action action,
                  struct ieee80211_sta *sta, u16 tid,
-                 u16 *ssn, u8 buf_size),
+                 u16 *ssn, u8 buf_size, bool amsdu),
 
-        TP_ARGS(local, sdata, action, sta, tid, ssn, buf_size),
+        TP_ARGS(local, sdata, action, sta, tid, ssn, buf_size, amsdu),
 
         TP_STRUCT__entry(
                 LOCAL_ENTRY
@@ -955,6 +985,7 @@ TRACE_EVENT(drv_ampdu_action,
                 __field(u16, tid)
                 __field(u16, ssn)
                 __field(u8, buf_size)
+                __field(bool, amsdu)
                 VIF_ENTRY
         ),
 
@@ -966,12 +997,13 @@ TRACE_EVENT(drv_ampdu_action,
                 __entry->tid = tid;
                 __entry->ssn = ssn ? *ssn : 0;
                 __entry->buf_size = buf_size;
+                __entry->amsdu = amsdu;
         ),
 
         TP_printk(
-                LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " action:%d tid:%d buf:%d",
+                LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " action:%d tid:%d buf:%d amsdu:%d",
                 LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->action,
-                __entry->tid, __entry->buf_size
+                __entry->tid, __entry->buf_size, __entry->amsdu
         )
 );