redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Wei Yongjun 2009-02-25 00:37:32 +00:00 committed by David S. Miller
parent acb5d75b9b
commit f3fbbe0f6f
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/core/neighbour.c
View File

@ -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) {

3
net/core/skbuff.c
View File

@ -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;