X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fnet.h;h=e552cf7ba8a66487a49df424cb47af56e892b42c;hb=f95480cf62e9acb42b74fce162544694b76c9704;hp=589011c07b8e3139e217c78ba284112ab57e2d82;hpb=4a7363f7060c032d53febe601fad8a05a13fb22b;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/net.h b/instrumentation/events/lttng-module/net.h
index 589011c0..e552cf7b 100644
--- a/instrumentation/events/lttng-module/net.h
+++ b/instrumentation/events/lttng-module/net.h
@@ -12,7 +12,7 @@
 
 TRACE_EVENT(net_dev_xmit,
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))
 	TP_PROTO(struct sk_buff *skb,
 		 int rc,
 		 struct net_device *dev,
@@ -30,26 +30,26 @@ TRACE_EVENT(net_dev_xmit,
 		__field(	void *,		skbaddr		)
 		__field(	unsigned int,	len		)
 		__field(	int,		rc		)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))
 		__string(	name,		dev->name	)
 #else
 		__string(	name,		skb->dev->name	)
 #endif
 	),
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))
 	TP_fast_assign(
-		tp_assign(skbaddr, skb);
-		tp_assign(len, skb_len);
-		tp_assign(rc, rc);
-		tp_strcpy(name, dev->name);
+		tp_assign(skbaddr, skb)
+		tp_assign(len, skb_len)
+		tp_assign(rc, rc)
+		tp_strcpy(name, dev->name)
 	),
 #else
 	TP_fast_assign(
-		tp_assign(skbaddr, skb);
-		tp_assign(len, skb->len);
-		tp_assign(rc, rc);
-		tp_strcpy(name, skb->dev->name);
+		tp_assign(skbaddr, skb)
+		tp_assign(len, skb->len)
+		tp_assign(rc, rc)
+		tp_strcpy(name, skb->dev->name)
 	),
 #endif
 
@@ -70,9 +70,9 @@ DECLARE_EVENT_CLASS(net_dev_template,
 	),
 
 	TP_fast_assign(
-		tp_assign(skbaddr, skb);
-		tp_assign(len, skb->len);
-		tp_strcpy(name, skb->dev->name);
+		tp_assign(skbaddr, skb)
+		tp_assign(len, skb->len)
+		tp_strcpy(name, skb->dev->name)
 	),
 
 	TP_printk("dev=%s skbaddr=%p len=%u",