Message ID | 1445081590-2924-4-git-send-email-pablo@netfilter.org |
---|---|
State | Awaiting Upstream |
Delegated to: | Pablo Neira |
Headers | show |
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile index 4d68e72..7638c36 100644 --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile @@ -10,7 +10,6 @@ obj-$(CONFIG_NETFILTER) = netfilter.o obj-$(CONFIG_NETFILTER_NETLINK) += nfnetlink.o obj-$(CONFIG_NETFILTER_NETLINK_ACCT) += nfnetlink_acct.o -nfnetlink_queue-y := nfnetlink_queue_core.o obj-$(CONFIG_NETFILTER_NETLINK_QUEUE) += nfnetlink_queue.o obj-$(CONFIG_NETFILTER_NETLINK_LOG) += nfnetlink_log.o diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue.c similarity index 100% rename from net/netfilter/nfnetlink_queue_core.c rename to net/netfilter/nfnetlink_queue.c
Now that we have integrated the ct glue code into nfnetlink_queue without introducing dependencies with the conntrack code. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- net/netfilter/Makefile | 1 - net/netfilter/{nfnetlink_queue_core.c => nfnetlink_queue.c} | 0 2 files changed, 1 deletion(-) rename net/netfilter/{nfnetlink_queue_core.c => nfnetlink_queue.c} (100%)