diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-11-08 12:41:34 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-11-08 12:41:34 -0500 |
commit | a51482bde22f99c63fbbb57d5d46cc666384e379 (patch) | |
tree | 5482ed1c0803edb2ffbd51035de921fb0f72d82b /net/xfrm/xfrm_state.c | |
parent | ac7c98eca88a854755475fcfe1b2bf5f97f90d99 (diff) |
[NET]: kfree cleanup
From: Jesper Juhl <jesper.juhl@gmail.com>
This is the net/ part of the big kfree cleanup patch.
Remove pointless checks for NULL prior to calling kfree() in net/.
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Diffstat (limited to 'net/xfrm/xfrm_state.c')
-rw-r--r-- | net/xfrm/xfrm_state.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 8b9a4747417..7cf48aa6c95 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
@@ -62,14 +62,10 @@ static void xfrm_state_gc_destroy(struct xfrm_state *x) | |||
62 | { | 62 | { |
63 | if (del_timer(&x->timer)) | 63 | if (del_timer(&x->timer)) |
64 | BUG(); | 64 | BUG(); |
65 | if (x->aalg) | 65 | kfree(x->aalg); |
66 | kfree(x->aalg); | 66 | kfree(x->ealg); |
67 | if (x->ealg) | 67 | kfree(x->calg); |
68 | kfree(x->ealg); | 68 | kfree(x->encap); |
69 | if (x->calg) | ||
70 | kfree(x->calg); | ||
71 | if (x->encap) | ||
72 | kfree(x->encap); | ||
73 | if (x->type) { | 69 | if (x->type) { |
74 | x->type->destructor(x); | 70 | x->type->destructor(x); |
75 | xfrm_put_type(x->type); | 71 | xfrm_put_type(x->type); |