OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PPP]: remove redundant NULL pointer checks before kfree & vfree 

kfree() and vfree() can both deal with NULL pointers. This patch removes 
redundant NULL pointer checks from the ppp code in drivers/net/

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jesper Juhl 2005-05-03 14:38:09 -07:00 committed by David S. Miller
parent c3924c70dd
commit 96edf83c4e
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ppp_deflate.c
View File

@ -87,8 +87,7 @@ static void z_comp_free(void *arg)
if (state) { if (state) {
zlib_deflateEnd(&state->strm); zlib_deflateEnd(&state->strm);
if (state->strm.workspace) vfree(state->strm.workspace);
vfree(state->strm.workspace);
kfree(state); kfree(state);
} }
} }
@ -308,8 +307,7 @@ static void z_decomp_free(void *arg)
if (state) { if (state) {
zlib_inflateEnd(&state->strm); zlib_inflateEnd(&state->strm);
if (state->strm.workspace) kfree(state->strm.workspace);
kfree(state->strm.workspace);
kfree(state); kfree(state);
} }
} }

12
drivers/net/ppp_generic.c
View File

@ -2467,14 +2467,10 @@ static void ppp_destroy_interface(struct ppp *ppp)
skb_queue_purge(&ppp->mrq); skb_queue_purge(&ppp->mrq);
#endif /* CONFIG_PPP_MULTILINK */ #endif /* CONFIG_PPP_MULTILINK */
#ifdef CONFIG_PPP_FILTER #ifdef CONFIG_PPP_FILTER
if (ppp->pass_filter) { kfree(ppp->pass_filter);
kfree(ppp->pass_filter); ppp->pass_filter = NULL;
ppp->pass_filter = NULL; kfree(ppp->active_filter);
} ppp->active_filter = NULL;
if (ppp->active_filter) {
kfree(ppp->active_filter);
ppp->active_filter = NULL;
}
#endif /* CONFIG_PPP_FILTER */ #endif /* CONFIG_PPP_FILTER */
kfree(ppp); kfree(ppp);