X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fskb.h;h=bca4ff34c39966506473d0be835ba9ab4af43443;hb=b78104db53f97c10add30016e365855a26f6e01e;hp=2079580aa0977a60e020e48461f4dbe6bffa9f71;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/skb.h b/instrumentation/events/lttng-module/skb.h
index 2079580a..bca4ff34 100644
--- a/instrumentation/events/lttng-module/skb.h
+++ b/instrumentation/events/lttng-module/skb.h
@@ -1,13 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM skb
 
 #if !defined(LTTNG_TRACE_SKB_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_SKB_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <linux/version.h>
+#include <lttng-kernel-version.h>
 
 /*
  * Tracepoint for free an sk_buff:
@@ -21,13 +22,13 @@ LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb,
 	TP_ARGS(skb, location),
 
 	TP_FIELDS(
-		ctf_integer(void *, skbaddr, skb)
-		ctf_integer(void *, location, location)
+		ctf_integer_hex(void *, skbaddr, skb)
+		ctf_integer_hex(void *, location, location)
 		ctf_integer_network(unsigned short, protocol, skb->protocol)
 	)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,37))
 LTTNG_TRACEPOINT_EVENT_MAP(consume_skb,
 
 	skb_consume,
@@ -37,12 +38,12 @@ LTTNG_TRACEPOINT_EVENT_MAP(consume_skb,
 	TP_ARGS(skb),
 
 	TP_FIELDS(
-		ctf_integer(void *, skbaddr, skb)
+		ctf_integer_hex(void *, skbaddr, skb)
 	)
 )
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,32))
 LTTNG_TRACEPOINT_EVENT(skb_copy_datagram_iovec,
 
 	TP_PROTO(const struct sk_buff *skb, int len),
@@ -50,7 +51,7 @@ LTTNG_TRACEPOINT_EVENT(skb_copy_datagram_iovec,
 	TP_ARGS(skb, len),
 
 	TP_FIELDS(
-		ctf_integer(const void *, skbaddr, skb)
+		ctf_integer_hex(const void *, skbaddr, skb)
 		ctf_integer(int, len, len)
 	)
 )
@@ -59,4 +60,4 @@ LTTNG_TRACEPOINT_EVENT(skb_copy_datagram_iovec,
 #endif /* LTTNG_TRACE_SKB_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>