netfilter: nfnetlink_queue: fix compilation with NF_CONNTRACK disabled
authorPablo Neira Ayuso <pablo@netfilter.org>
Tue, 19 Jun 2012 00:10:57 +0000 (02:10 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 19 Jun 2012 02:44:57 +0000 (04:44 +0200)
commit7c62234547255ce4c385a218915965bc2f14fe45
treefc3070b9f96f6fd00cef20e2c99bfdbe5aa9a0fc
parent6e9c2db3aa8c8219568db31e29dce7db46aa0dad
netfilter: nfnetlink_queue: fix compilation with NF_CONNTRACK disabled

In "9cb0176 netfilter: add glue code to integrate nfnetlink_queue and ctnetlink"
the compilation with NF_CONNTRACK disabled is broken. This patch fixes this
issue.

I have moved the conntrack part into nfnetlink_queue_ct.c to avoid
peppering the entire nfnetlink_queue.c code with ifdefs.

I also needed to rename nfnetlink_queue.c to nfnetlink_queue_pkt.c
to update the net/netfilter/Makefile to support conditional compilation
of the conntrack integration.

This patch also adds CONFIG_NETFILTER_QUEUE_CT in case you want to explicitly
disable the integration between nf_conntrack and nfnetlink_queue.

Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/net/netfilter/nfnetlink_queue.h [new file with mode: 0644]
net/netfilter/Kconfig
net/netfilter/Makefile
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nfnetlink_queue.c [deleted file]
net/netfilter/nfnetlink_queue_core.c [new file with mode: 0644]
net/netfilter/nfnetlink_queue_ct.c [new file with mode: 0644]