* [PATCH] core: remove some pointless conditionals before kfree_skb()
@ 2009-02-25 10:37 Wei Yongjun
2009-02-27 7:09 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2009-02-25 10:37 UTC (permalink / raw)
To: David Miller; +Cc: netdev
Remove some pointless conditionals before kfree_skb().
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
---
net/core/neighbour.c | 6 ++----
net/core/skbuff.c | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 278a142..01221de 100644
--- a/net/core/neighbour.c
+++ b/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/net/core/skbuff.c b/net/core/skbuff.c
index e5a8351..caf64c1 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -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;
--
1.5.3.8
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] core: remove some pointless conditionals before kfree_skb()
2009-02-25 10:37 [PATCH] core: remove some pointless conditionals before kfree_skb() Wei Yongjun
@ 2009-02-27 7:09 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-02-27 7:09 UTC (permalink / raw)
To: yjwei; +Cc: netdev
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Wed, 25 Feb 2009 18:37:32 +0800
> Remove some pointless conditionals before kfree_skb().
>
> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-02-27 7:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-25 10:37 [PATCH] core: remove some pointless conditionals before kfree_skb() Wei Yongjun
2009-02-27 7:09 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).