diff options
author | Alexei Starovoitov <ast@kernel.org> | 2018-03-28 15:05:34 -0400 |
---|---|---|
committer | Daniel Borkmann <daniel@iogearbox.net> | 2018-03-28 16:55:18 -0400 |
commit | 14624a9387c4d80766d1fdd237b0d110a0a1b43d (patch) | |
tree | 012028971177234b43470e06cd8c74e40147532a | |
parent | d992ee6c1ec3c9949d87877bdb44faa7f9cc60ce (diff) |
net/mac802154: disambiguate mac80215 vs mac802154 trace events
two trace events defined with the same name and both unused.
They conflict in allyesconfig build. Rename one of them.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-rw-r--r-- | net/mac802154/trace.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac802154/trace.h b/net/mac802154/trace.h index 2c8a43d3607f..df855c33daf2 100644 --- a/net/mac802154/trace.h +++ b/net/mac802154/trace.h | |||
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | /* Tracing for driver callbacks */ | 34 | /* Tracing for driver callbacks */ |
35 | 35 | ||
36 | DECLARE_EVENT_CLASS(local_only_evt, | 36 | DECLARE_EVENT_CLASS(local_only_evt4, |
37 | TP_PROTO(struct ieee802154_local *local), | 37 | TP_PROTO(struct ieee802154_local *local), |
38 | TP_ARGS(local), | 38 | TP_ARGS(local), |
39 | TP_STRUCT__entry( | 39 | TP_STRUCT__entry( |
@@ -45,7 +45,7 @@ DECLARE_EVENT_CLASS(local_only_evt, | |||
45 | TP_printk(LOCAL_PR_FMT, LOCAL_PR_ARG) | 45 | TP_printk(LOCAL_PR_FMT, LOCAL_PR_ARG) |
46 | ); | 46 | ); |
47 | 47 | ||
48 | DEFINE_EVENT(local_only_evt, 802154_drv_return_void, | 48 | DEFINE_EVENT(local_only_evt4, 802154_drv_return_void, |
49 | TP_PROTO(struct ieee802154_local *local), | 49 | TP_PROTO(struct ieee802154_local *local), |
50 | TP_ARGS(local) | 50 | TP_ARGS(local) |
51 | ); | 51 | ); |
@@ -65,12 +65,12 @@ TRACE_EVENT(802154_drv_return_int, | |||
65 | __entry->ret) | 65 | __entry->ret) |
66 | ); | 66 | ); |
67 | 67 | ||
68 | DEFINE_EVENT(local_only_evt, 802154_drv_start, | 68 | DEFINE_EVENT(local_only_evt4, 802154_drv_start, |
69 | TP_PROTO(struct ieee802154_local *local), | 69 | TP_PROTO(struct ieee802154_local *local), |
70 | TP_ARGS(local) | 70 | TP_ARGS(local) |
71 | ); | 71 | ); |
72 | 72 | ||
73 | DEFINE_EVENT(local_only_evt, 802154_drv_stop, | 73 | DEFINE_EVENT(local_only_evt4, 802154_drv_stop, |
74 | TP_PROTO(struct ieee802154_local *local), | 74 | TP_PROTO(struct ieee802154_local *local), |
75 | TP_ARGS(local) | 75 | TP_ARGS(local) |
76 | ); | 76 | ); |