From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 13 Apr 2020 20:18:35 +0000 (-0400)
Subject: instrumentation: net: remove compatibility code
X-Git-Tag: for-upstreaming-review-1~55
X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=commitdiff_plain;h=8672a07bd048367b5ce59e92d1c02c0f3c2ad074

instrumentation: net: remove compatibility code
---

diff --git a/instrumentation/events/lttng-module/net.h b/instrumentation/events/lttng-module/net.h
index 55aba4e0..40acebf8 100644
--- a/instrumentation/events/lttng-module/net.h
+++ b/instrumentation/events/lttng-module/net.h
@@ -13,7 +13,6 @@
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/icmp.h>
-#include <linux/version.h>
 #include <lttng-endian.h>
 #include <net/sock.h>
 
@@ -697,8 +696,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_template,
 	TP_ARGS(skb)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
-
 /* Trace events for the receive entry points */
 LTTNG_TRACEPOINT_EVENT_CLASS(net_dev_receive_entry_template,
 
@@ -766,10 +763,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_entry_template,
 	TP_ARGS(skb)
 )
 
-#endif /* kernel > 3.14 */
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0))
-
 LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_entry_template,
 
 	netif_receive_skb_list_entry,
@@ -781,10 +774,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_entry_template,
 	TP_ARGS(skb)
 )
 
-#endif /* kernel > 4.19 */
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0))
-
 /* Trace events for the receive exit points */
 LTTNG_TRACEPOINT_EVENT_CLASS(net_dev_receive_exit_template,
 
@@ -863,8 +852,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_exit_template,
 	TP_ARGS(ret)
 )
 
-#endif /* kernel > 5.0.0 */
-
 #endif /* LTTNG_TRACE_NET_H */
 
 /* This part must be outside protection */