Fix compilation on Linux kernel >= 3.18.0

[lttng-modules.git] / instrumentation / events / lttng-module / skb.h

diff --git a/instrumentation/events/lttng-module/skb.h b/instrumentation/events/lttng-module/skb.h
index 9a794499c667936a7b67377fbebda94e75da122a..106478bdbca8761060b996f71ebbc3c162ea5c18 100644 (file)
--- a/instrumentation/events/lttng-module/skb.h
+++ b/instrumentation/events/lttng-module/skb.h
@@ -1,17 +1,20 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM skb
 
-#if !defined(_TRACE_SKB_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_SKB_H
+#if !defined(LTTNG_TRACE_SKB_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_SKB_H
 
+#include "../../../probes/lttng-tracepoint-event.h"
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <linux/tracepoint.h>
+#include <linux/version.h>
 
 /*
  * Tracepoint for free an sk_buff:
  */
-TRACE_EVENT(kfree_skb,
+LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb,
+
+       skb_kfree,
 
        TP_PROTO(struct sk_buff *skb, void *location),
 
@@ -24,16 +27,19 @@ TRACE_EVENT(kfree_skb,
        ),
 
        TP_fast_assign(
-               tp_assign(skbaddr, skb);
-               tp_assign(location, location);
-               tp_assign(protocol, ntohs(skb->protocol));
+               tp_assign(skbaddr, skb)
+               tp_assign(location, location)
+               tp_assign(protocol, ntohs(skb->protocol))
        ),
 
        TP_printk("skbaddr=%p protocol=%u location=%p",
                __entry->skbaddr, __entry->protocol, __entry->location)
 )
 
-TRACE_EVENT(consume_skb,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
+LTTNG_TRACEPOINT_EVENT_MAP(consume_skb,
+
+       skb_consume,
 
        TP_PROTO(struct sk_buff *skb),
 
@@ -44,13 +50,15 @@ TRACE_EVENT(consume_skb,
        ),
 
        TP_fast_assign(
-               tp_assign(skbaddr, skb);
+               tp_assign(skbaddr, skb)
        ),
 
        TP_printk("skbaddr=%p", __entry->skbaddr)
 )
+#endif
 
-TRACE_EVENT(skb_copy_datagram_iovec,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
+LTTNG_TRACEPOINT_EVENT(skb_copy_datagram_iovec,
 
        TP_PROTO(const struct sk_buff *skb, int len),
 
@@ -62,14 +70,15 @@ TRACE_EVENT(skb_copy_datagram_iovec,
        ),
 
        TP_fast_assign(
-               tp_assign(skbaddr, skb);
-               tp_assign(len, len);
+               tp_assign(skbaddr, skb)
+               tp_assign(len, len)
        ),
 
        TP_printk("skbaddr=%p len=%d", __entry->skbaddr, __entry->len)
 )
+#endif
 
-#endif /* _TRACE_SKB_H */
+#endif /* LTTNG_TRACE_SKB_H */
 
 /* This part must be outside protection */
 #include "../../../probes/define_trace.h"