net: fixup for tracepoint napi:napi_poll

The recent change to tracepoint napi:napi_poll changed the order of
the parameters that perf scripts sees, the printk was correct.  The
problem was that the new parameters (work and budget) were pushed
in front of dev_name.

The new parameters obviously need to be appended to keep backward
compatible.

Fixes: 1db19db7f5ff ("net: tracepoint napi:napi_poll add work and budget")
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/trace/events/napi.h b/include/trace/events/napi.h
index 118ed77..0b9e513 100644 (file)
--- a/include/trace/events/napi.h
+++ b/include/trace/events/napi.h
@@ -18,16 +18,16 @@ TRACE_EVENT(napi_poll,
 
        TP_STRUCT__entry(
                __field(        struct napi_struct *,   napi)
+               __string(       dev_name, napi->dev ? napi->dev->name : NO_DEV)
                __field(        int,                    work)
                __field(        int,                    budget)
-               __string(       dev_name, napi->dev ? napi->dev->name : NO_DEV)
        ),
 
        TP_fast_assign(
                __entry->napi = napi;
+               __assign_str(dev_name, napi->dev ? napi->dev->name : NO_DEV);
                __entry->work = work;
                __entry->budget = budget;
-               __assign_str(dev_name, napi->dev ? napi->dev->name : NO_DEV);
        ),
 
        TP_printk("napi poll on napi struct %p for device %s work %d budget %d",