summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorstephen hemminger <stephen@networkplumber.org>2013-12-30 17:16:08 -0800
committerPablo Neira Ayuso <pablo@netfilter.org>2014-01-03 23:41:37 +0100
commitdcd93ed4cd1669b2c1510e801fe5f1132390761c (patch)
tree28049dbc7702c0c453f1af93359b3e5f24b342d9 /include
parent02eca9d2cc541806e8f03b4131c7ee9120246df7 (diff)
downloadlinux-stable-dcd93ed4cd1669b2c1510e801fe5f1132390761c.tar.gz
linux-stable-dcd93ed4cd1669b2c1510e801fe5f1132390761c.tar.bz2
linux-stable-dcd93ed4cd1669b2c1510e801fe5f1132390761c.zip
netfilter: nf_conntrack: remove dead code
The following code is not used in current upstream code. Some of this seems to be old hooks, other might be used by some out of tree module (which I don't care about breaking), and the need_ipv4_conntrack was used by old NAT code but no longer called. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
-rw-r--r--include/net/netfilter/ipv4/nf_conntrack_ipv4.h2
-rw-r--r--include/net/netfilter/nf_conntrack_l3proto.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/include/net/netfilter/ipv4/nf_conntrack_ipv4.h b/include/net/netfilter/ipv4/nf_conntrack_ipv4.h
index 6c3d12e2949f..981c327374da 100644
--- a/include/net/netfilter/ipv4/nf_conntrack_ipv4.h
+++ b/include/net/netfilter/ipv4/nf_conntrack_ipv4.h
@@ -19,6 +19,4 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp;
int nf_conntrack_ipv4_compat_init(void);
void nf_conntrack_ipv4_compat_fini(void);
-void need_ipv4_conntrack(void);
-
#endif /*_NF_CONNTRACK_IPV4_H*/
diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index 3efab704b7eb..adc1fa3dd7ab 100644
--- a/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/include/net/netfilter/nf_conntrack_l3proto.h
@@ -87,7 +87,6 @@ int nf_ct_l3proto_register(struct nf_conntrack_l3proto *proto);
void nf_ct_l3proto_unregister(struct nf_conntrack_l3proto *proto);
struct nf_conntrack_l3proto *nf_ct_l3proto_find_get(u_int16_t l3proto);
-void nf_ct_l3proto_put(struct nf_conntrack_l3proto *p);
/* Existing built-in protocols */
extern struct nf_conntrack_l3proto nf_conntrack_l3proto_generic;