netfilter: nfnetlink_queue: get rid of nfnetlink_queue_ct.c
authorPablo Neira Ayuso <pablo@netfilter.org>
Wed, 30 Sep 2015 21:53:44 +0000 (22:53 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Sun, 4 Oct 2015 19:45:44 +0000 (21:45 +0200)
commitb7bd1809e0784435791657502bc0d8280ad6f7ea
tree3e7eb5b9ad6b9658d06da545d42e842f8d256e4f
parente96f78ab2703f3b0d512f6b469bc685d2ef20475
netfilter: nfnetlink_queue: get rid of nfnetlink_queue_ct.c

The original intention was to avoid dependencies between nfnetlink_queue and
conntrack without ifdef pollution. However, we can achieve this by moving the
conntrack dependent code into ctnetlink and keep some glue code to access the
nfq_ct indirection from nfqueue.

After this patch, the nfq_ct indirection is always compiled in the netfilter
core to avoid polluting nfqueue with ifdefs. Thus, if nf_conntrack is not
compiled this results in only 8-bytes of memory waste in x86_64.

This patch also adds ctnetlink_nfqueue_seqadj() to avoid that the nf_conn
structure layout if exposed to nf_queue, which creates another dependency with
nf_conntrack at compilation time.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/linux/netfilter.h
include/net/netfilter/nfnetlink_queue.h [deleted file]
net/netfilter/Makefile
net/netfilter/core.c
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nfnetlink_queue_core.c
net/netfilter/nfnetlink_queue_ct.c [deleted file]