From 298ea010b540f08fde051b42f8874b3ce3651588 Mon Sep 17 00:00:00 2001
From: Gao feng <gaofeng@cn.fujitsu.com>
Date: Thu, 21 Jun 2012 04:36:40 +0000
Subject: [PATCH] --- yaml --- r: 315007 b: refs/heads/master c:
 f28997e27a03abc679f13824a0574b09112eea37 h: refs/heads/master i:   315005:
 eb64c22e81b624d30f94468b387a4f369cf03c27   315003:
 c901e0d3a5ce37ce68a64765210f57f8a75510bc   314999:
 96da5e253024d48762b6ca0ae0c105203cfb6d48   314991:
 46df32f79bc1c3d8db11250efeae1c8cbf419f1f   314975:
 b2284f5919e118ed0c6aff960320b7621e715fca   314943:
 92a708f688383e49c4a8e1699d5aa81ac8b0d864   314879:
 c7b75a64431d43d5c2a7920b9692843b4dca40b9 v: v3

---
 [refs]                                             | 2 +-
 trunk/include/net/netfilter/nf_conntrack_l4proto.h | 8 ++++++++
 trunk/net/netfilter/nf_conntrack_proto.c           | 3 +--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ff992894483e..b151917bdeed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1caad274515ffd9841ac57ce9a7b5fc35bbf689
+refs/heads/master: f28997e27a03abc679f13824a0574b09112eea37
diff --git a/trunk/include/net/netfilter/nf_conntrack_l4proto.h b/trunk/include/net/netfilter/nf_conntrack_l4proto.h
index 5dd60f2d02a1..08bb571b7abd 100644
--- a/trunk/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/trunk/include/net/netfilter/nf_conntrack_l4proto.h
@@ -124,6 +124,14 @@ extern int nf_conntrack_l4proto_register(struct net *net,
 extern void nf_conntrack_l4proto_unregister(struct net *net,
 					    struct nf_conntrack_l4proto *proto);
 
+static inline void nf_ct_kfree_compat_sysctl_table(struct nf_proto_net *pn)
+{
+#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
+	kfree(pn->ctl_compat_table);
+	pn->ctl_compat_table = NULL;
+#endif
+}
+
 /* Generic netlink helpers */
 extern int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb,
 				      const struct nf_conntrack_tuple *tuple);
diff --git a/trunk/net/netfilter/nf_conntrack_proto.c b/trunk/net/netfilter/nf_conntrack_proto.c
index 6f4b6f3deee5..9d6b6ab193a9 100644
--- a/trunk/net/netfilter/nf_conntrack_proto.c
+++ b/trunk/net/netfilter/nf_conntrack_proto.c
@@ -361,8 +361,7 @@ int nf_ct_l4proto_register_sysctl(struct net *net,
 		if (err == 0)
 			goto out;
 
-		kfree(pn->ctl_compat_table);
-		pn->ctl_compat_table = NULL;
+		nf_ct_kfree_compat_sysctl_table(pn);
 		nf_ct_unregister_sysctl(&pn->ctl_table_header,
 					&pn->ctl_table,
 					&pn->users);