X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fskb.h;h=106478bdbca8761060b996f71ebbc3c162ea5c18;hb=1b4cbadbff1a2bc47ab7bcc361fb8a72f6f3042c;hp=9a794499c667936a7b67377fbebda94e75da122a;hpb=b283666ff19841a28b0448c6a867beb2f809f11a;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/skb.h b/instrumentation/events/lttng-module/skb.h
index 9a794499..106478bd 100644
--- 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"