X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fnet.h;h=81045a620d1579235fe9d1a7c498266790eae682;hb=5873cbc67601a95b53e8c87fbeafb31910485fd0;hp=e48c4db1ea3557d975f38e31f1ca0bd513b6122d;hpb=92ffeac79340b97edea5f50b8c550da6df9ac634;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/net.h b/instrumentation/events/lttng-module/net.h
index e48c4db1..81045a62 100644
--- a/instrumentation/events/lttng-module/net.h
+++ b/instrumentation/events/lttng-module/net.h
@@ -10,7 +10,7 @@
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/tcp.h>
-#include <linux/version.h>
+#include <lttng-kernel-version.h>
 #include <lttng-endian.h>
 #include <net/sock.h>
 
@@ -133,6 +133,30 @@ static inline enum transport_header_types __get_transport_header_type(struct sk_
 	return TH_NONE;
 }
 
+static struct lttng_enum_entry proto_transport_enum_entries[] = {
+	[0] = {
+		.start = { .value = 0, .signedness = 0, },
+		.end = { .value = IPPROTO_TCP - 1, .signedness = 0, },
+		.string = "_unknown",
+	},
+	[1] = {
+		.start = { .value = IPPROTO_TCP, .signedness = 0, },
+		.end = { .value = IPPROTO_TCP, .signedness = 0, },
+		.string = "_tcp",
+	},
+	[2] = {
+		.start = { .value = IPPROTO_TCP + 1, .signedness = 0, },
+		.end = { .value = 255, .signedness = 0, },
+		.string = "_unknown",
+	},
+};
+
+static const struct lttng_enum_desc proto_transport_header_type = {
+	.name = "proto_transport_header_type",
+	.entries = proto_transport_enum_entries,
+	.nr_entries = ARRAY_SIZE(proto_transport_enum_entries),
+};
+
 static struct lttng_enum_entry transport_enum_entries[] = {
 	[0] = {
 		.start = { .value = TH_NONE, .signedness = 0, },
@@ -194,7 +218,8 @@ static struct lttng_event_field ipv4fields[] = {
 		.name = "protocol",
 		.type = {
 			.atype = atype_enum,
-			.u.basic.enumeration.desc = &transport_header_type,
+			.u.basic.enumeration.desc =
+				&proto_transport_header_type,
 			.u.basic.enumeration.container_type = {
 				.size = 8,
 				.alignment = 8,
@@ -290,7 +315,8 @@ static struct lttng_event_field ipv6fields[] = {
 		.name = "nexthdr",
 		.type = {
 			.atype = atype_enum,
-			.u.basic.enumeration.desc = &transport_header_type,
+			.u.basic.enumeration.desc =
+				&proto_transport_header_type,
 			.u.basic.enumeration.container_type = {
 				.size = 8,
 				.alignment = 8,
@@ -412,7 +438,7 @@ LTTNG_TRACEPOINT_ENUM(net_network_header,
 
 LTTNG_TRACEPOINT_EVENT(net_dev_xmit,
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,40))
 	TP_PROTO(struct sk_buff *skb,
 		 int rc,
 		 struct net_device *dev,
@@ -429,7 +455,7 @@ LTTNG_TRACEPOINT_EVENT(net_dev_xmit,
 	TP_FIELDS(
 		ctf_integer_hex(void *, skbaddr, skb)
 		ctf_integer(int, rc, rc)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,40))
 		ctf_integer(unsigned int, len, skb_len)
 		ctf_string(name, dev->name)
 #else