X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Fskb.h;h=039debc65a2fb44da361c800560a8b82efb154e1;hb=63e36d2e65f91ddab7c12581e3bb9ebc14fbbdb2;hp=186732eac189a61206f8994e928670ebc4b9381b;hpb=96c477dabaaf6cd1734bebe0972fef877e5a463b;p=lttng-modules.git

diff --git a/include/instrumentation/events/skb.h b/include/instrumentation/events/skb.h
index 186732ea..039debc6 100644
--- a/include/instrumentation/events/skb.h
+++ b/include/instrumentation/events/skb.h
@@ -15,7 +15,6 @@
  */
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) \
 	|| LTTNG_KERNEL_RANGE(5,15,58, 5,16,0))
-
 LTTNG_TRACEPOINT_ENUM(skb_drop_reason,
 	TP_ENUM_VALUES(
 		ctf_enum_value("NOT_SPECIFIED",	SKB_DROP_REASON_NOT_SPECIFIED)
@@ -27,7 +26,22 @@ LTTNG_TRACEPOINT_ENUM(skb_drop_reason,
 		ctf_enum_value("MAX",		SKB_DROP_REASON_MAX)
 	)
 )
+#elif (LTTNG_RHEL_KERNEL_RANGE(5,14,0,70,0,0, 5,15,0,0,0,0))
+LTTNG_TRACEPOINT_ENUM(skb_drop_reason,
+	TP_ENUM_VALUES(
+		ctf_enum_value("NOT_SPECIFIED",	SKB_DROP_REASON_NOT_SPECIFIED)
+		ctf_enum_value("NO_SOCKET",	SKB_DROP_REASON_NO_SOCKET)
+		ctf_enum_value("PKT_TOO_SMALL",	SKB_DROP_REASON_PKT_TOO_SMALL)
+		ctf_enum_value("TCP_CSUM",	SKB_DROP_REASON_TCP_CSUM)
+		ctf_enum_value("UDP_CSUM",	SKB_DROP_REASON_UDP_CSUM)
+		ctf_enum_value("MAX",		SKB_DROP_REASON_MAX)
+	)
+)
+#endif
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) \
+	|| LTTNG_KERNEL_RANGE(5,15,58, 5,16,0) \
+	|| LTTNG_RHEL_KERNEL_RANGE(5,14,0,70,0,0, 5,15,0,0,0,0))
 LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb,
 
 	skb_kfree,
@@ -61,6 +75,21 @@ LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb,
 )
 #endif
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,3,0))
+LTTNG_TRACEPOINT_EVENT_MAP(consume_skb,
+
+	skb_consume,
+
+	TP_PROTO(struct sk_buff *skb, void *location),
+
+	TP_ARGS(skb, location),
+
+	TP_FIELDS(
+		ctf_integer_hex(void *, skbaddr, skb)
+		ctf_integer_hex(void *, location, location)
+	)
+)
+#else
 LTTNG_TRACEPOINT_EVENT_MAP(consume_skb,
 
 	skb_consume,
@@ -73,6 +102,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(consume_skb,
 		ctf_integer_hex(void *, skbaddr, skb)
 	)
 )
+#endif
 
 LTTNG_TRACEPOINT_EVENT(skb_copy_datagram_iovec,