Merge tag 'stable/for-linus-3.9-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / net / mac80211 / trace.h

diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index a2ca72ce3380b1d6a159821f1a0c28d688c04bb0..3d7cd2a0582f4e467504d296c8150b258cc7dd91 100644 (file)
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -340,6 +340,7 @@ TRACE_EVENT(drv_bss_info_changed,
                __field(u16, assoc_cap)
                __field(u64, sync_tsf)
                __field(u32, sync_device_ts)
+               __field(u8, sync_dtim_count)
                __field(u32, basic_rates)
                __array(int, mcast_rate, IEEE80211_NUM_BANDS)
                __field(u16, ht_operation_mode)
@@ -379,6 +380,7 @@ TRACE_EVENT(drv_bss_info_changed,
                __entry->assoc_cap = info->assoc_capability;
                __entry->sync_tsf = info->sync_tsf;
                __entry->sync_device_ts = info->sync_device_ts;
+               __entry->sync_dtim_count = info->sync_dtim_count;
                __entry->basic_rates = info->basic_rates;
                memcpy(__entry->mcast_rate, info->mcast_rate,
                       sizeof(__entry->mcast_rate));
@@ -477,7 +479,7 @@ TRACE_EVENT(drv_set_tim,
 
        TP_printk(
                LOCAL_PR_FMT STA_PR_FMT " set:%d",
-               LOCAL_PR_ARG, STA_PR_FMT, __entry->set
+               LOCAL_PR_ARG, STA_PR_ARG, __entry->set
        )
 );
 
@@ -1682,7 +1684,7 @@ TRACE_EVENT(api_sta_block_awake,
 
        TP_printk(
                LOCAL_PR_FMT STA_PR_FMT " block:%d",
-               LOCAL_PR_ARG, STA_PR_FMT, __entry->block
+               LOCAL_PR_ARG, STA_PR_ARG, __entry->block
        )
 );
 
@@ -1780,7 +1782,7 @@ TRACE_EVENT(api_eosp,
 
        TP_printk(
                LOCAL_PR_FMT STA_PR_FMT,
-               LOCAL_PR_ARG, STA_PR_FMT
+               LOCAL_PR_ARG, STA_PR_ARG
        )
 );
 
@@ -1860,6 +1862,25 @@ TRACE_EVENT(drv_set_default_unicast_key,
                  LOCAL_PR_ARG, VIF_PR_ARG, __entry->key_idx)
 );
 
+TRACE_EVENT(api_radar_detected,
+       TP_PROTO(struct ieee80211_local *local),
+
+       TP_ARGS(local),
+
+       TP_STRUCT__entry(
+               LOCAL_ENTRY
+       ),
+
+       TP_fast_assign(
+               LOCAL_ASSIGN;
+       ),
+
+       TP_printk(
+               LOCAL_PR_FMT " radar detected",
+               LOCAL_PR_ARG
+       )
+);
+
 #ifdef CONFIG_MAC80211_MESSAGE_TRACING
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM mac80211_msg