Merge tag 'trace-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[linux-2.6-microblaze.git] / include / trace / events / fib.h

diff --git a/include/trace/events/fib.h b/include/trace/events/fib.h
index 6f2a4dc..c2300c4 100644 (file)
--- a/include/trace/events/fib.h
+++ b/include/trace/events/fib.h
@@ -32,7 +32,7 @@ TRACE_EVENT(fib_table_lookup,
                __array(        __u8,   gw6,    16      )
                __field(        u16,    sport           )
                __field(        u16,    dport           )
-               __dynamic_array(char,  name,   IFNAMSIZ )
+               __array(char,  name,   IFNAMSIZ )
        ),
 
        TP_fast_assign(
@@ -66,7 +66,7 @@ TRACE_EVENT(fib_table_lookup,
                }
 
                dev = nhc ? nhc->nhc_dev : NULL;
-               __assign_str(name, dev ? dev->name : "-");
+               strlcpy(__entry->name, dev ? dev->name : "-", IFNAMSIZ);
 
                if (nhc) {
                        if (nhc->nhc_gw_family == AF_INET) {
@@ -95,7 +95,7 @@ TRACE_EVENT(fib_table_lookup,
                  __entry->tb_id, __entry->oif, __entry->iif, __entry->proto,
                  __entry->src, __entry->sport, __entry->dst, __entry->dport,
                  __entry->tos, __entry->scope, __entry->flags,
-                 __get_str(name), __entry->gw4, __entry->gw6, __entry->err)
+                 __entry->name, __entry->gw4, __entry->gw6, __entry->err)
 );
 #endif /* _TRACE_FIB_H */