diff options
| author | Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | 2011-03-16 19:05:59 -0400 |
|---|---|---|
| committer | Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> | 2011-03-16 19:05:59 -0400 |
| commit | db228a32ab728f01a7d1586a4909282e94f185fd (patch) | |
| tree | 10b6a8888aa17007f3b0b565ff47b0c8047d5d95 /include/trace | |
| parent | 2bb8ae6cfcc6daaf5fa71235059fb2deb710b872 (diff) | |
lttng-instrumentation-net-fix-conflict
lttng instrumentation net fix conflict
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/net.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/trace/net.h b/include/trace/net.h index 5e774ebbb6d..91a0f02d0bc 100644 --- a/include/trace/net.h +++ b/include/trace/net.h @@ -1,13 +1,13 @@ -#ifndef _TRACE_NET_H -#define _TRACE_NET_H +#ifndef _TRACE_LTTNG_NET_H +#define _TRACE_LTTNG_NET_H #include <linux/tracepoint.h> struct sk_buff; -DECLARE_TRACE(net_dev_xmit, +DECLARE_TRACE(lttng_net_dev_xmit, TP_PROTO(struct sk_buff *skb), TP_ARGS(skb)); -DECLARE_TRACE(net_dev_receive, +DECLARE_TRACE(lttng_net_dev_receive, TP_PROTO(struct sk_buff *skb), TP_ARGS(skb)); DECLARE_TRACE(net_tcpv4_rcv, |