Skip to contentSkip to conversation

core: remove some pointless conditionals before kfree_skb()

PATCH Applied Wei Yongjun 2 participants 2 messages Feb 25, 2009 – Feb 27, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 core: remove some pointless conditionals before kfree_skb()

Remove some pointless conditionals before kfree_skb().

---
 net/core/neighbour.c |    6 ++----
 net/core/skbuff.c    |    3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)
net/core/neighbour.c +2 -4
index 278a142..01221de 100644
@@ -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) {
net/core/skbuff.c +1 -2
index e5a8351..caf64c1 100644
@@ -1216,8 +1216,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;
Signature · 1 line
1.5.3.8