Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound...

[mv-sheeva.git] / net / mac80211 / driver-trace.h

diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h
index 37b9051afcf3ebb17b7a5651ac6685eb9d58698e..ee94ea0c67e9f164c71d359b9c4dbb3812d25541 100644 (file)
--- a/net/mac80211/driver-trace.h
+++ b/net/mac80211/driver-trace.h
@@ -131,17 +131,35 @@ TRACE_EVENT(drv_config,
                LOCAL_ENTRY
                __field(u32, changed)
                __field(int, ret)
+               __field(u32, flags)
+               __field(int, power_level)
+               __field(int, dynamic_ps_timeout)
+               __field(int, max_sleep_period)
+               __field(u16, listen_interval)
+               __field(u8, long_frame_max_tx_count)
+               __field(u8, short_frame_max_tx_count)
+               __field(int, center_freq)
+               __field(int, channel_type)
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
                __entry->changed = changed;
                __entry->ret = ret;
+               __entry->flags = local->hw.conf.flags;
+               __entry->power_level = local->hw.conf.power_level;
+               __entry->dynamic_ps_timeout = local->hw.conf.dynamic_ps_timeout;
+               __entry->max_sleep_period = local->hw.conf.max_sleep_period;
+               __entry->listen_interval = local->hw.conf.listen_interval;
+               __entry->long_frame_max_tx_count = local->hw.conf.long_frame_max_tx_count;
+               __entry->short_frame_max_tx_count = local->hw.conf.short_frame_max_tx_count;
+               __entry->center_freq = local->hw.conf.channel->center_freq;
+               __entry->channel_type = local->hw.conf.channel_type;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT " ch:%#x ret:%d",
-               LOCAL_PR_ARG, __entry->changed, __entry->ret
+               LOCAL_PR_FMT " ch:%#x freq:%d ret:%d",
+               LOCAL_PR_ARG, __entry->changed, __entry->center_freq, __entry->ret
        )
 );
 
@@ -167,6 +185,8 @@ TRACE_EVENT(drv_bss_info_changed,
                __field(u64, timestamp)
                __field(u32, basic_rates)
                __field(u32, changed)
+               __field(bool, enable_beacon)
+               __field(u16, ht_operation_mode)
        ),
 
        TP_fast_assign(
@@ -183,6 +203,8 @@ TRACE_EVENT(drv_bss_info_changed,
                __entry->assoc_cap = info->assoc_capability;
                __entry->timestamp = info->timestamp;
                __entry->basic_rates = info->basic_rates;
+               __entry->enable_beacon = info->enable_beacon;
+               __entry->ht_operation_mode = info->ht_operation_mode;
        ),
 
        TP_printk(
@@ -634,11 +656,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
@@ -647,10 +670,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;
@@ -659,8 +684,8 @@ 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 || TRACE_HEADER_MULTI_READ */