Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h
index 6831fb1641c8a375d64059a4f83ae6eee2d631eb..49c84218b2f41036bf34a28c6b2c02f5580803ed 100644 (file)
--- a/net/mac80211/driver-trace.h
+++ b/net/mac80211/driver-trace.h
@@ -531,6 +531,27 @@ TRACE_EVENT(drv_get_tkip_seq,
        )
 );
 
+TRACE_EVENT(drv_set_frag_threshold,
+       TP_PROTO(struct ieee80211_local *local, u32 value),
+
+       TP_ARGS(local, value),
+
+       TP_STRUCT__entry(
+               LOCAL_ENTRY
+               __field(u32, value)
+       ),
+
+       TP_fast_assign(
+               LOCAL_ASSIGN;
+               __entry->value = value;
+       ),
+
+       TP_printk(
+               LOCAL_PR_FMT " value:%d",
+               LOCAL_PR_ARG, __entry->value
+       )
+);
+
 TRACE_EVENT(drv_set_rts_threshold,
        TP_PROTO(struct ieee80211_local *local, u32 value),
 
@@ -862,6 +883,100 @@ TRACE_EVENT(drv_channel_switch,
        )
 );
 
+TRACE_EVENT(drv_set_antenna,
+       TP_PROTO(struct ieee80211_local *local, u32 tx_ant, u32 rx_ant, int ret),
+
+       TP_ARGS(local, tx_ant, rx_ant, ret),
+
+       TP_STRUCT__entry(
+               LOCAL_ENTRY
+               __field(u32, tx_ant)
+               __field(u32, rx_ant)
+               __field(int, ret)
+       ),
+
+       TP_fast_assign(
+               LOCAL_ASSIGN;
+               __entry->tx_ant = tx_ant;
+               __entry->rx_ant = rx_ant;
+               __entry->ret = ret;
+       ),
+
+       TP_printk(
+               LOCAL_PR_FMT " tx_ant:%d rx_ant:%d ret:%d",
+               LOCAL_PR_ARG, __entry->tx_ant, __entry->rx_ant, __entry->ret
+       )
+);
+
+TRACE_EVENT(drv_get_antenna,
+       TP_PROTO(struct ieee80211_local *local, u32 tx_ant, u32 rx_ant, int ret),
+
+       TP_ARGS(local, tx_ant, rx_ant, ret),
+
+       TP_STRUCT__entry(
+               LOCAL_ENTRY
+               __field(u32, tx_ant)
+               __field(u32, rx_ant)
+               __field(int, ret)
+       ),
+
+       TP_fast_assign(
+               LOCAL_ASSIGN;
+               __entry->tx_ant = tx_ant;
+               __entry->rx_ant = rx_ant;
+               __entry->ret = ret;
+       ),
+
+       TP_printk(
+               LOCAL_PR_FMT " tx_ant:%d rx_ant:%d ret:%d",
+               LOCAL_PR_ARG, __entry->tx_ant, __entry->rx_ant, __entry->ret
+       )
+);
+
+TRACE_EVENT(drv_remain_on_channel,
+       TP_PROTO(struct ieee80211_local *local, struct ieee80211_channel *chan,
+                enum nl80211_channel_type chantype, unsigned int duration),
+
+       TP_ARGS(local, chan, chantype, duration),
+
+       TP_STRUCT__entry(
+               LOCAL_ENTRY
+               __field(int, center_freq)
+               __field(int, channel_type)
+               __field(unsigned int, duration)
+       ),
+
+       TP_fast_assign(
+               LOCAL_ASSIGN;
+               __entry->center_freq = chan->center_freq;
+               __entry->channel_type = chantype;
+               __entry->duration = duration;
+       ),
+
+       TP_printk(
+               LOCAL_PR_FMT " freq:%dMHz duration:%dms",
+               LOCAL_PR_ARG, __entry->center_freq, __entry->duration
+       )
+);
+
+TRACE_EVENT(drv_cancel_remain_on_channel,
+       TP_PROTO(struct ieee80211_local *local),
+
+       TP_ARGS(local),
+
+       TP_STRUCT__entry(
+               LOCAL_ENTRY
+       ),
+
+       TP_fast_assign(
+               LOCAL_ASSIGN;
+       ),
+
+       TP_printk(
+               LOCAL_PR_FMT, LOCAL_PR_ARG
+       )
+);
+
 /*
  * Tracing for API calls that drivers call.
  */
@@ -1099,6 +1214,42 @@ TRACE_EVENT(api_chswitch_done,
        )
 );
 
+TRACE_EVENT(api_ready_on_channel,
+       TP_PROTO(struct ieee80211_local *local),
+
+       TP_ARGS(local),
+
+       TP_STRUCT__entry(
+               LOCAL_ENTRY
+       ),
+
+       TP_fast_assign(
+               LOCAL_ASSIGN;
+       ),
+
+       TP_printk(
+               LOCAL_PR_FMT, LOCAL_PR_ARG
+       )
+);
+
+TRACE_EVENT(api_remain_on_channel_expired,
+       TP_PROTO(struct ieee80211_local *local),
+
+       TP_ARGS(local),
+
+       TP_STRUCT__entry(
+               LOCAL_ENTRY
+       ),
+
+       TP_fast_assign(
+               LOCAL_ASSIGN;
+       ),
+
+       TP_printk(
+               LOCAL_PR_FMT, LOCAL_PR_ARG
+       )
+);
+
 /*
  * Tracing for internal functions
  * (which may also be called in response to driver calls)