[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
@@ -714,10 +714,8 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
|
||||
}
|
||||
|
||||
/* This code has moved from del_if() function */
|
||||
if (dev->priv) {
|
||||
kfree(dev->priv);
|
||||
dev->priv = NULL;
|
||||
}
|
||||
kfree(dev->priv);
|
||||
dev->priv = NULL;
|
||||
|
||||
#ifdef CONFIG_WANPIPE_MULTPPP
|
||||
if (cnf->config_id == WANCONFIG_MPPP)
|
||||
@@ -851,10 +849,8 @@ static int wanrouter_delete_interface(struct wan_device *wandev, char *name)
|
||||
|
||||
/* Due to new interface linking method using dev->priv,
|
||||
* this code has moved from del_if() function.*/
|
||||
if (dev->priv){
|
||||
kfree(dev->priv);
|
||||
dev->priv=NULL;
|
||||
}
|
||||
kfree(dev->priv);
|
||||
dev->priv=NULL;
|
||||
|
||||
unregister_netdev(dev);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user