From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 8 Nov 2018 20:52:04 +0000 (-0500)
Subject: Drop support for kernels < 3.0 from net instrumentation
X-Git-Tag: v2.12.0-pre~79
X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=commitdiff_plain;h=76fe715f04c2fa803b7418cd2e936b4eadacbec3

Drop support for kernels < 3.0 from net instrumentation

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
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 87892636..bfa14fc6 100644
--- a/instrumentation/events/lttng-module/net.h
+++ b/instrumentation/events/lttng-module/net.h
@@ -439,30 +439,18 @@ LTTNG_TRACEPOINT_ENUM(net_network_header,
 
 LTTNG_TRACEPOINT_EVENT(net_dev_xmit,
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))
 	TP_PROTO(struct sk_buff *skb,
 		 int rc,
 		 struct net_device *dev,
 		 unsigned int skb_len),
 
 	TP_ARGS(skb, rc, dev, skb_len),
-#else
-	TP_PROTO(struct sk_buff *skb,
-		 int rc),
-
-	TP_ARGS(skb, rc),
-#endif
 
 	TP_FIELDS(
 		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
 	)
 )