mac80211: support P2P Device abstraction

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

diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index 2e60f4acd027e46e52e218e538efa995b1ed1b7b..65e9a2a1a3e12bd54f6ef8d3731bc9eb974dfcc9 100644 (file)
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -24,7 +24,7 @@
                        __string(vif_name, sdata->dev ? sdata->dev->name : "<nodev>")
 #define VIF_ASSIGN     __entry->vif_type = sdata->vif.type; __entry->sdata = sdata;    \
                        __entry->p2p = sdata->vif.p2p;                                  \
-                       __assign_str(vif_name, sdata->dev ? sdata->dev->name : "<nodev>")
+                       __assign_str(vif_name, sdata->dev ? sdata->dev->name : sdata->name)
 #define VIF_PR_FMT     " vif:%s(%d%s)"
 #define VIF_PR_ARG     __get_str(vif_name), __entry->vif_type, __entry->p2p ? "/p2p" : ""
 
@@ -306,7 +306,8 @@ TRACE_EVENT(drv_bss_info_changed,
                __field(u8, dtimper)
                __field(u16, bcnint)
                __field(u16, assoc_cap)
-               __field(u64, timestamp)
+               __field(u64, sync_tsf)
+               __field(u32, sync_device_ts)
                __field(u32, basic_rates)
                __field(u32, changed)
                __field(bool, enable_beacon)
@@ -325,7 +326,8 @@ TRACE_EVENT(drv_bss_info_changed,
                __entry->dtimper = info->dtim_period;
                __entry->bcnint = info->beacon_int;
                __entry->assoc_cap = info->assoc_capability;
-               __entry->timestamp = info->last_tsf;
+               __entry->sync_tsf = info->sync_tsf;
+               __entry->sync_device_ts = info->sync_device_ts;
                __entry->basic_rates = info->basic_rates;
                __entry->enable_beacon = info->enable_beacon;
                __entry->ht_operation_mode = info->ht_operation_mode;
@@ -1244,6 +1246,13 @@ TRACE_EVENT(drv_get_rssi,
        )
 );
 
+DEFINE_EVENT(local_sdata_evt, drv_mgd_prepare_tx,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata),
+
+       TP_ARGS(local, sdata)
+);
+
 /*
  * Tracing for API calls that drivers call.
  */