Commit f3fbbe0f authored Feb 25, 2009 by Wei Yongjun Committed by David S. Miller Feb 26, 2009

core: remove some pointless conditionals before kfree_skb()



Remove some pointless conditionals before kfree_skb().

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent acb5d75b

net/core/neighbour.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -871,7 +871,6 @@ 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);
		} else {
		out:
		@@ -908,7 +907,6 @@ int __neigh_event_send(struct neighbour neigh, struct sk_buff skb)
		neigh->updated = jiffies;
		write_unlock_bh(&neigh->lock);

		if (skb)
		kfree_skb(skb);
		return 1;
		}

net/core/skbuff.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1208,7 +1208,6 @@ unsigned char __pskb_pull_tail(struct sk_buff skb, int delta)
		insp = list;
		}
		if (!pskb_pull(list, eat)) {
		if (clone)
		kfree_skb(clone);
		return NULL;
		}