From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 17 Apr 2015 16:15:03 +0000 (-0400)
Subject: Fix: net instrumentation for kernels 2.6.39 and below
X-Git-Tag: v2.7.0-rc1~52
X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=974c096958f9b40839e3c7a02d3a34f19de0a7af;p=lttng-modules.git

Fix: net instrumentation for kernels 2.6.39 and below

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/instrumentation/events/lttng-module/net.h b/instrumentation/events/lttng-module/net.h
index d91aac05..01314ed5 100644
--- a/instrumentation/events/lttng-module/net.h
+++ b/instrumentation/events/lttng-module/net.h
@@ -28,11 +28,12 @@ LTTNG_TRACEPOINT_EVENT(net_dev_xmit,
 
 	TP_FIELDS(
 		ctf_integer(void *, skbaddr, skb)
-		ctf_integer(unsigned int, len, skb_len)
 		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
 	)