[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>
This commit is contained in:

committed by
David S. Miller

parent
ac7c98eca8
commit
a51482bde2
@@ -587,8 +587,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
|
||||
skb->next = NULL;
|
||||
}
|
||||
|
||||
if (tmp_hdr)
|
||||
kfree(tmp_hdr);
|
||||
kfree(tmp_hdr);
|
||||
|
||||
if (err == 0) {
|
||||
IP6_INC_STATS(IPSTATS_MIB_FRAGOKS);
|
||||
@@ -1186,10 +1185,8 @@ int ip6_push_pending_frames(struct sock *sk)
|
||||
|
||||
out:
|
||||
inet->cork.flags &= ~IPCORK_OPT;
|
||||
if (np->cork.opt) {
|
||||
kfree(np->cork.opt);
|
||||
np->cork.opt = NULL;
|
||||
}
|
||||
kfree(np->cork.opt);
|
||||
np->cork.opt = NULL;
|
||||
if (np->cork.rt) {
|
||||
dst_release(&np->cork.rt->u.dst);
|
||||
np->cork.rt = NULL;
|
||||
@@ -1214,10 +1211,8 @@ void ip6_flush_pending_frames(struct sock *sk)
|
||||
|
||||
inet->cork.flags &= ~IPCORK_OPT;
|
||||
|
||||
if (np->cork.opt) {
|
||||
kfree(np->cork.opt);
|
||||
np->cork.opt = NULL;
|
||||
}
|
||||
kfree(np->cork.opt);
|
||||
np->cork.opt = NULL;
|
||||
if (np->cork.rt) {
|
||||
dst_release(&np->cork.rt->u.dst);
|
||||
np->cork.rt = NULL;
|
||||
|
Reference in New Issue
Block a user