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/dccp/ipv4.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/dccp/ipv4.c')
-rw-r--r-- | net/dccp/ipv4.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 4b9bc81ae1a3..ca03521112c5 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -1263,10 +1263,8 @@ static int dccp_v4_destroy_sock(struct sock *sk) | |||
1263 | if (inet_csk(sk)->icsk_bind_hash != NULL) | 1263 | if (inet_csk(sk)->icsk_bind_hash != NULL) |
1264 | inet_put_port(&dccp_hashinfo, sk); | 1264 | inet_put_port(&dccp_hashinfo, sk); |
1265 | 1265 | ||
1266 | if (dp->dccps_service_list != NULL) { | 1266 | kfree(dp->dccps_service_list); |
1267 | kfree(dp->dccps_service_list); | 1267 | dp->dccps_service_list = NULL; |
1268 | dp->dccps_service_list = NULL; | ||
1269 | } | ||
1270 | 1268 | ||
1271 | ccid_hc_rx_exit(dp->dccps_hc_rx_ccid, sk); | 1269 | ccid_hc_rx_exit(dp->dccps_hc_rx_ccid, sk); |
1272 | ccid_hc_tx_exit(dp->dccps_hc_tx_ccid, sk); | 1270 | ccid_hc_tx_exit(dp->dccps_hc_tx_ccid, sk); |