mac80211: use common skb queue

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

diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h
index ce734b58d07ab6b0ac14cbfa88b6f6bb915c6b98..6b90630151abb4a0dba8b573822b5b41c1035190 100644 (file)
--- a/net/mac80211/driver-trace.h
+++ b/net/mac80211/driver-trace.h
@@ -219,6 +219,31 @@ TRACE_EVENT(drv_bss_info_changed,
        )
 );
 
+TRACE_EVENT(drv_configure_arp_filter,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                struct in_ifaddr *ifa_list, int ret),
+
+       TP_ARGS(local, sdata, ifa_list, ret),
+
+       TP_STRUCT__entry(
+               LOCAL_ENTRY
+               VIF_ENTRY
+               __field(int, ret)
+       ),
+
+       TP_fast_assign(
+               LOCAL_ASSIGN;
+               VIF_ASSIGN;
+               __entry->ret = ret;
+       ),
+
+       TP_printk(
+               VIF_PR_FMT LOCAL_PR_FMT " ret:%d",
+               VIF_PR_ARG, LOCAL_PR_ARG, __entry->ret
+       )
+);
+
 TRACE_EVENT(drv_prepare_multicast,
        TP_PROTO(struct ieee80211_local *local, int mc_count, u64 ret),
 
@@ -774,6 +799,34 @@ TRACE_EVENT(drv_flush,
        )
 );
 
+TRACE_EVENT(drv_channel_switch,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_channel_switch *ch_switch),
+
+       TP_ARGS(local, ch_switch),
+
+       TP_STRUCT__entry(
+               LOCAL_ENTRY
+               __field(u64, timestamp)
+               __field(bool, block_tx)
+               __field(u16, freq)
+               __field(u8, count)
+       ),
+
+       TP_fast_assign(
+               LOCAL_ASSIGN;
+               __entry->timestamp = ch_switch->timestamp;
+               __entry->block_tx = ch_switch->block_tx;
+               __entry->freq = ch_switch->channel->center_freq;
+               __entry->count = ch_switch->count;
+       ),
+
+       TP_printk(
+               LOCAL_PR_FMT " new freq:%u count:%d",
+               LOCAL_PR_ARG, __entry->freq, __entry->count
+       )
+);
+
 /*
  * Tracing for API calls that drivers call.
  */
@@ -823,25 +876,23 @@ TRACE_EVENT(api_start_tx_ba_cb,
 );
 
 TRACE_EVENT(api_stop_tx_ba_session,
-       TP_PROTO(struct ieee80211_sta *sta, u16 tid, u16 initiator),
+       TP_PROTO(struct ieee80211_sta *sta, u16 tid),
 
-       TP_ARGS(sta, tid, initiator),
+       TP_ARGS(sta, tid),
 
        TP_STRUCT__entry(
                STA_ENTRY
                __field(u16, tid)
-               __field(u16, initiator)
        ),
 
        TP_fast_assign(
                STA_ASSIGN;
                __entry->tid = tid;
-               __entry->initiator = initiator;
        ),
 
        TP_printk(
-               STA_PR_FMT " tid:%d initiator:%d",
-               STA_PR_ARG, __entry->tid, __entry->initiator
+               STA_PR_FMT " tid:%d",
+               STA_PR_ARG, __entry->tid
        )
 );
 
@@ -992,6 +1043,27 @@ TRACE_EVENT(api_sta_block_awake,
        )
 );
 
+TRACE_EVENT(api_chswitch_done,
+       TP_PROTO(struct ieee80211_sub_if_data *sdata, bool success),
+
+       TP_ARGS(sdata, success),
+
+       TP_STRUCT__entry(
+               VIF_ENTRY
+               __field(bool, success)
+       ),
+
+       TP_fast_assign(
+               VIF_ASSIGN;
+               __entry->success = success;
+       ),
+
+       TP_printk(
+               VIF_PR_FMT " success=%d",
+               VIF_PR_ARG, __entry->success
+       )
+);
+
 /*
  * Tracing for internal functions
  * (which may also be called in response to driver calls)