diff --git a/[refs] b/[refs] index bef05096800c..7ecc7671ada2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad440ad66f1617194738bf674dfe2d38978ac54d +refs/heads/master: ca9da2dd63b0b32de1b693953dff66cadeb6400b diff --git a/trunk/include/trace/events/skb.h b/trunk/include/trace/events/skb.h index f10293c41b1e..0c68ae22da22 100644 --- a/trunk/include/trace/events/skb.h +++ b/trunk/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",