Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / include / trace / events / skb.h

diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h
index f10293c..0c68ae2 100644 (file)
--- a/include/trace/events/skb.h
+++ b/include/trace/events/skb.h
@@ -19,14 +19,14 @@ TRACE_EVENT(kfree_skb,
 
        TP_STRUCT__entry(
                __field(        void *,         skbaddr         )
-               __field(        unsigned short, protocol        )
                __field(        void *,         location        )
+               __field(        unsigned short, protocol        )
        ),
 
        TP_fast_assign(
                __entry->skbaddr = skb;
-               __entry->protocol = ntohs(skb->protocol);
                __entry->location = location;
+               __entry->protocol = ntohs(skb->protocol);
        ),
 
        TP_printk("skbaddr=%p protocol=%u location=%p",