X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fskb.h;h=a257304916c97f215ea188c14b70fce48bc273f4;hb=9cf29d3eaffa56199259919c90108de84724b4fb;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..a2573049 100644
--- a/instrumentation/events/lttng-module/skb.h
+++ b/instrumentation/events/lttng-module/skb.h
@@ -7,11 +7,14 @@
 #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,
+TRACE_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))
+TRACE_EVENT_MAP(consume_skb,
+
+	skb_consume,
 
 	TP_PROTO(struct sk_buff *skb),
 
@@ -44,12 +50,14 @@ TRACE_EVENT(consume_skb,
 	),
 
 	TP_fast_assign(
-		tp_assign(skbaddr, skb);
+		tp_assign(skbaddr, skb)
 	),
 
 	TP_printk("skbaddr=%p", __entry->skbaddr)
 )
+#endif
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
 TRACE_EVENT(skb_copy_datagram_iovec,
 
 	TP_PROTO(const struct sk_buff *skb, int len),
@@ -62,12 +70,13 @@ 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 */