X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fnet.h;h=4f4b817ac4721baaea7dcc9b3d734f0817a57c74;hb=578e68ec82a889d3864e90ddc203d69360362110;hp=f4a0d97ee13b2c92cced3906579ec6d3f6e3b683;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/net.h b/instrumentation/events/lttng-module/net.h
index f4a0d97e..4f4b817a 100644
--- a/instrumentation/events/lttng-module/net.h
+++ b/instrumentation/events/lttng-module/net.h
@@ -4,7 +4,7 @@
 #if !defined(LTTNG_TRACE_NET_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_NET_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/ip.h>
@@ -27,12 +27,13 @@ LTTNG_TRACEPOINT_EVENT(net_dev_xmit,
 #endif
 
 	TP_FIELDS(
-		ctf_integer(void *, skbaddr, skb)
-		ctf_integer(unsigned int, len, skb_len)
+		ctf_integer_hex(void *, skbaddr, skb)
 		ctf_integer(int, rc, rc)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))
+		ctf_integer(unsigned int, len, skb_len)
 		ctf_string(name, dev->name)
 #else
+		ctf_integer(unsigned int, len, skb->len)
 		ctf_string(name, skb->dev->name)
 #endif
 	)
@@ -45,7 +46,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(net_dev_template,
 	TP_ARGS(skb),
 
 	TP_FIELDS(
-		ctf_integer(void *, skbaddr, skb)
+		ctf_integer_hex(void *, skbaddr, skb)
 		ctf_integer(unsigned int, len, skb->len)
 		ctf_string(name, skb->dev->name)
 	)
@@ -58,14 +59,22 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(net_dev_template, net_dev_queue,
 	TP_ARGS(skb)
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(net_dev_template, netif_receive_skb,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_template,
+
+	netif_receive_skb,
+
+	net_if_receive_skb,
 
 	TP_PROTO(struct sk_buff *skb),
 
 	TP_ARGS(skb)
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(net_dev_template, netif_rx,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_template,
+
+	netif_rx,
+
+	net_if_rx,
 
 	TP_PROTO(struct sk_buff *skb),
 
@@ -74,4 +83,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(net_dev_template, netif_rx,
 #endif /* LTTNG_TRACE_NET_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>