diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-09-30 22:53:54 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-10-04 21:45:44 +0200 |
| commit | 32f40c5fa730fa598e500dfbaab8aabc39c56f96 (patch) | |
| tree | a933e328fb882f75f65b01e22a1296d1fc8485c7 /net/netfilter | |
| parent | b7bd1809e0784435791657502bc0d8280ad6f7ea (diff) | |
| download | linux-stable-32f40c5fa730fa598e500dfbaab8aabc39c56f96.tar.gz linux-stable-32f40c5fa730fa598e500dfbaab8aabc39c56f96.tar.bz2 linux-stable-32f40c5fa730fa598e500dfbaab8aabc39c56f96.zip | |
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 <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/Makefile | 1 | ||||
| -rw-r--r-- | net/netfilter/nfnetlink_queue.c (renamed from net/netfilter/nfnetlink_queue_core.c) | 0 |
2 files changed, 0 insertions, 1 deletions
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile index 4d68e72d59ab..7638c36b498c 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 index b1f1c747d518..b1f1c747d518 100644 --- a/net/netfilter/nfnetlink_queue_core.c +++ b/net/netfilter/nfnetlink_queue.c |