Commit f3fbbe0f authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller

core: remove some pointless conditionals before kfree_skb()

Remove some pointless conditionals before kfree_skb().
Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent acb5d75b
...@@ -871,8 +871,7 @@ static void neigh_timer_handler(unsigned long arg) ...@@ -871,8 +871,7 @@ static void neigh_timer_handler(unsigned long arg)
write_unlock(&neigh->lock); write_unlock(&neigh->lock);
neigh->ops->solicit(neigh, skb); neigh->ops->solicit(neigh, skb);
atomic_inc(&neigh->probes); atomic_inc(&neigh->probes);
if (skb) kfree_skb(skb);
kfree_skb(skb);
} else { } else {
out: out:
write_unlock(&neigh->lock); write_unlock(&neigh->lock);
...@@ -908,8 +907,7 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb) ...@@ -908,8 +907,7 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
neigh->updated = jiffies; neigh->updated = jiffies;
write_unlock_bh(&neigh->lock); write_unlock_bh(&neigh->lock);
if (skb) kfree_skb(skb);
kfree_skb(skb);
return 1; return 1;
} }
} else if (neigh->nud_state & NUD_STALE) { } else if (neigh->nud_state & NUD_STALE) {
......
...@@ -1208,8 +1208,7 @@ unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta) ...@@ -1208,8 +1208,7 @@ unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta)
insp = list; insp = list;
} }
if (!pskb_pull(list, eat)) { if (!pskb_pull(list, eat)) {
if (clone) kfree_skb(clone);
kfree_skb(clone);
return NULL; return NULL;
} }
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment