lttng-modules v0.19-stable: setup_trace_write: Fix recursive locking

[lttng-modules.git] / probes / net-trace.c

diff --git a/probes/net-trace.c b/probes/net-trace.c
index 3124125dfd0a65cd197d6ec3545c7c189ca95474..7e7419a16b9e0c375bc31312c9304df8b7395249 100644 (file)
--- a/probes/net-trace.c
+++ b/probes/net-trace.c
@@ -19,7 +19,7 @@
 
 void probe_net_dev_xmit(void *_data, struct sk_buff *skb);
 
-DEFINE_MARKER_TP(net, dev_xmit, net_dev_xmit, probe_net_dev_xmit,
+DEFINE_MARKER_TP(net, dev_xmit, lttng_net_dev_xmit, probe_net_dev_xmit,
        "skb %p protocol #n2u%hu");
 
 notrace void probe_net_dev_xmit(void *_data, struct sk_buff *skb)
@@ -37,7 +37,7 @@ notrace void probe_net_dev_xmit(void *_data, struct sk_buff *skb)
 
 void probe_net_dev_receive(void *_data, struct sk_buff *skb);
 
-DEFINE_MARKER_TP(net, dev_receive, net_dev_receive, probe_net_dev_receive,
+DEFINE_MARKER_TP(net, dev_receive, lttng_net_dev_receive, probe_net_dev_receive,
        "skb %p protocol #n2u%hu");
 
 notrace void probe_net_dev_receive(void *_data, struct sk_buff *skb)
@@ -172,7 +172,7 @@ void probe_socket_socketpair(void *_data, int family, int type, int protocol,
 void probe_socket_sendmsg(void *_data, struct socket *sock, struct msghdr *msg, size_t size,
        int ret);
 
-DEFINE_MARKER_TP(net, socket_sendmsg, net_socket_sendmsg,
+DEFINE_MARKER_TP(net, socket_sendmsg, socket_sendmsg,
        probe_socket_sendmsg,
        "sock %p msg %p size %zu ret %d");
 
@@ -195,7 +195,7 @@ notrace void probe_socket_sendmsg(void *_data, struct socket *sock, struct msghd
 void probe_socket_recvmsg(void *_data, struct socket *sock, struct msghdr *msg, size_t size,
        int flags, int ret);
 
-DEFINE_MARKER_TP(net, socket_recvmsg, net_socket_recvmsg,
+DEFINE_MARKER_TP(net, socket_recvmsg, socket_recvmsg,
        probe_socket_recvmsg,
        "sock %p msg %p size %zu flags %d ret %d");