From 700d4e079cfb53dfe9ed6e81ddedb35945e3d27e Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Wed, 25 Feb 2009 00:37:32 +0000
Subject: [PATCH] --- yaml --- r: 134764 b: refs/heads/master c:
 f3fbbe0f6f6cbac4c2aa3d71d95e49cf148286d6 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/neighbour.c | 6 ++----
 trunk/net/core/skbuff.c    | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index c29d3343676e..4d1b3b2b975d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acb5d75b9bcff73d32d3471a9b3e9a4189223e48
+refs/heads/master: f3fbbe0f6f6cbac4c2aa3d71d95e49cf148286d6
diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c
index e1144cb94b99..417b6d739fb7 100644
--- a/trunk/net/core/neighbour.c
+++ b/trunk/net/core/neighbour.c
@@ -871,8 +871,7 @@ static void neigh_timer_handler(unsigned long arg)
 		write_unlock(&neigh->lock);
 		neigh->ops->solicit(neigh, skb);
 		atomic_inc(&neigh->probes);
-		if (skb)
-			kfree_skb(skb);
+		kfree_skb(skb);
 	} else {
 out:
 		write_unlock(&neigh->lock);
@@ -908,8 +907,7 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
 			neigh->updated = jiffies;
 			write_unlock_bh(&neigh->lock);
 
-			if (skb)
-				kfree_skb(skb);
+			kfree_skb(skb);
 			return 1;
 		}
 	} else if (neigh->nud_state & NUD_STALE) {
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index 33640d99c8ed..e5e2111a397d 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -1208,8 +1208,7 @@ unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta)
 					insp = list;
 				}
 				if (!pskb_pull(list, eat)) {
-					if (clone)
-						kfree_skb(clone);
+					kfree_skb(clone);
 					return NULL;
 				}
 				break;