Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / trace / events / skb.h

diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h
index 75ce9d500d8e3c62dbfffbc0acafca13d11d90aa..f10293c41b1e8e690706941d12f654550f61b65b 100644 (file)
--- a/include/trace/events/skb.h
+++ b/include/trace/events/skb.h
@@ -25,9 +25,7 @@ TRACE_EVENT(kfree_skb,
 
        TP_fast_assign(
                __entry->skbaddr = skb;
-               if (skb) {
-                       __entry->protocol = ntohs(skb->protocol);
-               }
+               __entry->protocol = ntohs(skb->protocol);
                __entry->location = location;
        ),