net/mac802154: disambiguate mac80215 vs mac802154 trace events
authorAlexei Starovoitov <ast@kernel.org>
Wed, 28 Mar 2018 19:05:34 +0000 (12:05 -0700)
committerDaniel Borkmann <daniel@iogearbox.net>
Wed, 28 Mar 2018 20:55:18 +0000 (22:55 +0200)
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>
net/mac802154/trace.h

index 2c8a43d3607fcaee5e5dbab1df7ee1b1883defea..df855c33daf2c2d82d7f5f6073cfc08cc935154c 100644 (file)
@@ -33,7 +33,7 @@
 
 /* Tracing for driver callbacks */
 
-DECLARE_EVENT_CLASS(local_only_evt,
+DECLARE_EVENT_CLASS(local_only_evt4,
        TP_PROTO(struct ieee802154_local *local),
        TP_ARGS(local),
        TP_STRUCT__entry(
@@ -45,7 +45,7 @@ DECLARE_EVENT_CLASS(local_only_evt,
        TP_printk(LOCAL_PR_FMT, LOCAL_PR_ARG)
 );
 
-DEFINE_EVENT(local_only_evt, 802154_drv_return_void,
+DEFINE_EVENT(local_only_evt4, 802154_drv_return_void,
        TP_PROTO(struct ieee802154_local *local),
        TP_ARGS(local)
 );
@@ -65,12 +65,12 @@ TRACE_EVENT(802154_drv_return_int,
                  __entry->ret)
 );
 
-DEFINE_EVENT(local_only_evt, 802154_drv_start,
+DEFINE_EVENT(local_only_evt4, 802154_drv_start,
        TP_PROTO(struct ieee802154_local *local),
        TP_ARGS(local)
 );
 
-DEFINE_EVENT(local_only_evt, 802154_drv_stop,
+DEFINE_EVENT(local_only_evt4, 802154_drv_stop,
        TP_PROTO(struct ieee802154_local *local),
        TP_ARGS(local)
 );