From 54f76021c8367559173e04ed8b6657b18b985c49 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 6 Jan 2011 12:53:19 -0500
Subject: [PATCH] --- yaml --- r: 228945 b: refs/heads/master c:
 881fe4bdcdc899674524e30a76c76d298b447008 h: refs/heads/master i:   228943:
 4ea96bd380c18337944770bf98ce2adca8ce5ca5 v: v3

---
 [refs]                           | 2 +-
 trunk/include/trace/events/skb.h | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8e9a377756aa..f192d2bbeeae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec6e7c3ae39cb1dc279b5274aaaadd09ff8e224b
+refs/heads/master: 881fe4bdcdc899674524e30a76c76d298b447008
diff --git a/trunk/include/trace/events/skb.h b/trunk/include/trace/events/skb.h
index 75ce9d500d8e..f10293c41b1e 100644
--- a/trunk/include/trace/events/skb.h
+++ b/trunk/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;
 	),