X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fskb.h;h=a9396f4508ab8fc47bde2bda26bccb144ee38f64;hb=b7cdc18250880cc44edeef4a4b42c8ac7a135a6d;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..a9396f45 100644
--- a/instrumentation/events/lttng-module/skb.h
+++ b/instrumentation/events/lttng-module/skb.h
@@ -1,10 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #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>
@@ -21,13 +22,12 @@ 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))
 LTTNG_TRACEPOINT_EVENT_MAP(consume_skb,
 
 	skb_consume,
@@ -37,12 +37,10 @@ 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))
 LTTNG_TRACEPOINT_EVENT(skb_copy_datagram_iovec,
 
 	TP_PROTO(const struct sk_buff *skb, int len),
@@ -50,13 +48,12 @@ 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)
 	)
 )
-#endif
 
 #endif /* LTTNG_TRACE_SKB_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>