From 81fe3c54d2df4b6bc1cfb7328943244180984688 Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Tue, 15 Apr 2008 19:01:43 -0700
Subject: [PATCH] --- yaml --- r: 90735 b: refs/heads/master c:
 11ecede7874efb9c31184b49090fc6d9bb17f9f6 h: refs/heads/master i:   90733:
 a3a43d3d82d192e158a3348f41089f0d30fae942   90731:
 0895b832b151f72332045eeaab625e726de65913   90727:
 a457a3837b7b8c20eedc4d464a66fcc739aa337e   90719:
 913cc5e5f48c2fdbab9295cd999d4c029283c4ef v: v3

---
 [refs]                | 2 +-
 trunk/net/tipc/core.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e83e916cef35..3541dbf7347c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dec827d174d7f76c457238800183ca864a639365
+refs/heads/master: 11ecede7874efb9c31184b49090fc6d9bb17f9f6
diff --git a/trunk/net/tipc/core.h b/trunk/net/tipc/core.h
index 3fe9b70331d9..3229d29e352a 100644
--- a/trunk/net/tipc/core.h
+++ b/trunk/net/tipc/core.h
@@ -334,8 +334,7 @@ static inline struct sk_buff *buf_acquire(u32 size)
 
 static inline void buf_discard(struct sk_buff *skb)
 {
-	if (likely(skb != NULL))
-		kfree_skb(skb);
+	kfree_skb(skb);
 }
 
 #endif