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 <[email protected]>
---
drivers/net/ppp_deflate.c | 6 ++----
drivers/net/ppp_generic.c | 12 ++++--------
2 files changed, 6 insertions(+), 12 deletions(-)
--- linux-2.6.12-rc2-mm3-orig/drivers/net/ppp_deflate.c 2005-04-05 21:21:33.000000000 +0200
+++ linux-2.6.12-rc2-mm3/drivers/net/ppp_deflate.c 2005-04-29 00:44:26.000000000 +0200
@@ -87,8 +87,7 @@ static void z_comp_free(void *arg)
if (state) {
zlib_deflateEnd(&state->strm);
- if (state->strm.workspace)
- vfree(state->strm.workspace);
+ vfree(state->strm.workspace);
kfree(state);
}
}
@@ -308,8 +307,7 @@ static void z_decomp_free(void *arg)
if (state) {
zlib_inflateEnd(&state->strm);
- if (state->strm.workspace)
- kfree(state->strm.workspace);
+ kfree(state->strm.workspace);
kfree(state);
}
}
--- linux-2.6.12-rc2-mm3-orig/drivers/net/ppp_generic.c 2005-04-11 21:20:47.000000000 +0200
+++ linux-2.6.12-rc2-mm3/drivers/net/ppp_generic.c 2005-04-29 00:46:00.000000000 +0200
@@ -2510,14 +2510,10 @@ static void ppp_destroy_interface(struct
skb_queue_purge(&ppp->mrq);
#endif /* CONFIG_PPP_MULTILINK */
#ifdef CONFIG_PPP_FILTER
- if (ppp->pass_filter) {
- kfree(ppp->pass_filter);
- ppp->pass_filter = NULL;
- }
- if (ppp->active_filter) {
- kfree(ppp->active_filter);
- ppp->active_filter = NULL;
- }
+ kfree(ppp->pass_filter);
+ ppp->pass_filter = NULL;
+ kfree(ppp->active_filter);
+ ppp->active_filter = NULL;
#endif /* CONFIG_PPP_FILTER */
kfree(ppp);
PS. Please CC me on replies.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
