Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next

[cascardo/linux.git] / drivers / net / wireless / brcm80211 / brcmfmac / tracepoint.h

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h b/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h
index bc29171..3c67529 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h
@@ -78,13 +78,15 @@ TRACE_EVENT(brcmf_hexdump,
        TP_ARGS(data, len),
        TP_STRUCT__entry(
                __field(unsigned long, len)
+               __field(unsigned long, addr)
                __dynamic_array(u8, hdata, len)
        ),
        TP_fast_assign(
                __entry->len = len;
+               __entry->addr = (unsigned long)data;
                memcpy(__get_dynamic_array(hdata), data, len);
        ),
-       TP_printk("hexdump [length=%lu]", __entry->len)
+       TP_printk("hexdump [addr=%lx, length=%lu]", __entry->addr, __entry->len)
 );
 
 TRACE_EVENT(brcmf_bdchdr,
@@ -108,6 +110,23 @@ TRACE_EVENT(brcmf_bdchdr,
        TP_printk("bdc: prio=%d siglen=%d", __entry->prio, __entry->siglen)
 );
 
+TRACE_EVENT(brcmf_sdpcm_hdr,
+       TP_PROTO(bool tx, void *data),
+       TP_ARGS(tx, data),
+       TP_STRUCT__entry(
+               __field(u8, tx)
+               __field(u16, len)
+               __array(u8, hdr, 12)
+       ),
+       TP_fast_assign(
+               memcpy(__entry->hdr, data, 12);
+               __entry->len = __entry->hdr[0] | (__entry->hdr[1] << 8);
+               __entry->tx = tx ? 1 : 0;
+       ),
+       TP_printk("sdpcm: %s len %u, seq %d", __entry->tx ? "TX" : "RX",
+                 __entry->len, __entry->hdr[4])
+);
+
 #ifdef CONFIG_BRCM_TRACING
 
 #undef TRACE_INCLUDE_PATH