mac80211: convert aggregation to operate on vifs/stas

[safe/jmp/linux-2.6] / net / mac80211 / driver-trace.h

diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h
index 48c93d1..b8fef1d 100644 (file)
--- a/net/mac80211/driver-trace.h
+++ b/net/mac80211/driver-trace.h
@@ -5,7 +5,7 @@
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
 
-#ifndef CONFIG_MAC80211_DRIVER_API_TRACER
+#if !defined(CONFIG_MAC80211_DRIVER_API_TRACER) || defined(__CHECKER__)
 #undef TRACE_EVENT
 #define TRACE_EVENT(name, proto, ...) \
 static inline void trace_ ## name(proto) {}
@@ -191,31 +191,55 @@ TRACE_EVENT(drv_bss_info_changed,
        )
 );
 
+TRACE_EVENT(drv_prepare_multicast,
+       TP_PROTO(struct ieee80211_local *local, int mc_count, u64 ret),
+
+       TP_ARGS(local, mc_count, ret),
+
+       TP_STRUCT__entry(
+               LOCAL_ENTRY
+               __field(int, mc_count)
+               __field(u64, ret)
+       ),
+
+       TP_fast_assign(
+               LOCAL_ASSIGN;
+               __entry->mc_count = mc_count;
+               __entry->ret = ret;
+       ),
+
+       TP_printk(
+               LOCAL_PR_FMT " prepare mc (%d): %llx",
+               LOCAL_PR_ARG, __entry->mc_count,
+               (unsigned long long) __entry->ret
+       )
+);
+
 TRACE_EVENT(drv_configure_filter,
        TP_PROTO(struct ieee80211_local *local,
                 unsigned int changed_flags,
                 unsigned int *total_flags,
-                int mc_count),
+                u64 multicast),
 
-       TP_ARGS(local, changed_flags, total_flags, mc_count),
+       TP_ARGS(local, changed_flags, total_flags, multicast),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
                __field(unsigned int, changed)
                __field(unsigned int, total)
-               __field(int, mc)
+               __field(u64, multicast)
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
                __entry->changed = changed_flags;
                __entry->total = *total_flags;
-               __entry->mc = mc_count;
+               __entry->multicast = multicast;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT " changed:%#x total:%#x mc:%d",
-               LOCAL_PR_ARG, __entry->changed, __entry->total, __entry->mc
+               LOCAL_PR_FMT " changed:%#x total:%#x",
+               LOCAL_PR_ARG, __entry->changed, __entry->total
        )
 );
 
@@ -610,11 +634,12 @@ TRACE_EVENT(drv_tx_last_beacon,
 
 TRACE_EVENT(drv_ampdu_action,
        TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_vif *vif,
                 enum ieee80211_ampdu_mlme_action action,
                 struct ieee80211_sta *sta, u16 tid,
                 u16 *ssn, int ret),
 
-       TP_ARGS(local, action, sta, tid, ssn, ret),
+       TP_ARGS(local, vif, action, sta, tid, ssn, ret),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
@@ -623,10 +648,12 @@ TRACE_EVENT(drv_ampdu_action,
                __field(u16, tid)
                __field(u16, ssn)
                __field(int, ret)
+               VIF_ENTRY
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
+               VIF_ASSIGN;
                STA_ASSIGN;
                __entry->ret = ret;
                __entry->action = action;
@@ -635,11 +662,11 @@ TRACE_EVENT(drv_ampdu_action,
        ),
 
        TP_printk(
-               LOCAL_PR_FMT  STA_PR_FMT " action:%d tid:%d ret:%d",
-               LOCAL_PR_ARG, STA_PR_ARG, __entry->action, __entry->tid, __entry->ret
+               LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " action:%d tid:%d ret:%d",
+               LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->action, __entry->tid, __entry->ret
        )
 );
-#endif /* __MAC80211_DRIVER_TRACE */
+#endif /* !__MAC80211_DRIVER_TRACE || TRACE_HEADER_MULTI_READ */
 
 #undef TRACE_INCLUDE_PATH
 #define TRACE_INCLUDE_PATH .