Merge branches 'acpi-misc' and 'acpi-video'

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

diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index 8ba70d26b82e4a6ece6b81662f7e748ae365648a..3bb4459b52c780ef7cc5a645661337f4c78417a0 100644 (file)
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -828,6 +828,36 @@ TRACE_EVENT(drv_sta_state,
        )
 );
 
+TRACE_EVENT(drv_sta_set_txpwr,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                struct ieee80211_sta *sta),
+
+       TP_ARGS(local, sdata, sta),
+
+       TP_STRUCT__entry(
+               LOCAL_ENTRY
+               VIF_ENTRY
+               STA_ENTRY
+               __field(s16, txpwr)
+               __field(u8, type)
+       ),
+
+       TP_fast_assign(
+               LOCAL_ASSIGN;
+               VIF_ASSIGN;
+               STA_ASSIGN;
+               __entry->txpwr = sta->txpwr.power;
+               __entry->type = sta->txpwr.type;
+       ),
+
+       TP_printk(
+               LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT " txpwr: %d type %d",
+               LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG,
+               __entry->txpwr,  __entry->type
+       )
+);
+
 TRACE_EVENT(drv_sta_rc_update,
        TP_PROTO(struct ieee80211_local *local,
                 struct ieee80211_sub_if_data *sdata,