From: Fabian Frederick <fabf@skynet.be>
Date: Fri, 20 Jun 2014 20:38:58 +0000 (+0200)
Subject: netfilter: ctnetlink: remove null test before kfree
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=397304b52d9b726a4aed0bf9086612bba429d420;p=linux-beck.git

netfilter: ctnetlink: remove null test before kfree

Fix checkpatch warning:
WARNING: kfree(NULL) is safe this check is probably not required

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 58579634427d..aee017f625d9 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -742,8 +742,7 @@ static int ctnetlink_done(struct netlink_callback *cb)
 {
 	if (cb->args[1])
 		nf_ct_put((struct nf_conn *)cb->args[1]);
-	if (cb->data)
-		kfree(cb->data);
+	kfree(cb->data);
 	return 0;
 }