diff options
| author | Wei Yongjun <yjwei@cn.fujitsu.com> | 2009-02-25 00:37:32 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-26 23:07:36 -0800 |
| commit | f3fbbe0f6f6cbac4c2aa3d71d95e49cf148286d6 (patch) | |
| tree | 2d1ba3f45f771308ffa2b4c950055bcd1945df69 /net/core | |
| parent | acb5d75b9bcff73d32d3471a9b3e9a4189223e48 (diff) | |
| download | kernel_samsung_crespo-f3fbbe0f6f6cbac4c2aa3d71d95e49cf148286d6.zip kernel_samsung_crespo-f3fbbe0f6f6cbac4c2aa3d71d95e49cf148286d6.tar.gz kernel_samsung_crespo-f3fbbe0f6f6cbac4c2aa3d71d95e49cf148286d6.tar.bz2 | |
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>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/neighbour.c | 6 | ||||
| -rw-r--r-- | 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 e1144cb..417b6d7 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 33640d9..e5e2111 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -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; |