From: Pablo Neira Ayuso Date: Wed, 30 Sep 2015 21:53:54 +0000 (+0100) Subject: netfilter: rename nfnetlink_queue_core.c to nfnetlink_queue.c X-Git-Tag: v4.4-rc1~141^2~103^2~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32f40c5fa730fa598e500dfbaab8aabc39c56f96;p=thirdparty%2Fkernel%2Flinux.git netfilter: rename nfnetlink_queue_core.c to 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 --- diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile index 4d68e72d59ab2..7638c36b498cc 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