netfilter: fix compilation of the nfnl_cthelper if NF_CONNTRACK is unset
authorPablo Neira Ayuso <pablo@netfilter.org>
Mon, 18 Jun 2012 19:14:30 +0000 (21:14 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 18 Jun 2012 23:25:08 +0000 (01:25 +0200)
commit6e9c2db3aa8c8219568db31e29dce7db46aa0dad
treec780b6e367d3a4976b0e2f56d56e1ea702ace6f4
parent32f5376003920a8bc1bd97c6cddcf42df0b6a833
netfilter: fix compilation of the nfnl_cthelper if NF_CONNTRACK is unset

This patch fixes the compilation of net/netfilter/nfnetlink_cthelper.c
if CONFIG_NF_CONNTRACK is not set.

This patch also moves the definition of the cthelper infrastructure to
the scope of NF_CONNTRACK things.

I have also renamed NETFILTER_NETLINK_CTHELPER by NF_CT_NETLINK_HELPER,
to use similar names to other nf_conntrack_netlink extensions. Better now
that this has been only for two days in David's tree.

Two new dependencies have been added:

* NF_CT_NETLINK
* NETFILTER_NETLINK_QUEUE

Since these infrastructure requires both ctnetlink and nfqueue.

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/Kconfig
net/netfilter/Makefile