Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-11 15:40:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

netfilter: Kconfig rename QUEUE_CT to GLUE_CT

Browse Source 
Conntrack information attaching infrastructure is now generic and
update it's name to use `glue' in previous patch. This patch updates
Kconfig symbol name and adding NF_CT_NETLINK dependency.

Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Ken-ichirou MATSUZAWA 2015-10-05 11:48:47 +09:00 committed by Pablo Neira Ayuso
parent a4b4766c3c
commit 83f3e94d34
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/netfilter/Kconfig
View File

@ -354,7 +354,7 @@ config NF_CT_NETLINK_HELPER
select NETFILTER_NETLINK select NETFILTER_NETLINK
depends on NF_CT_NETLINK depends on NF_CT_NETLINK
depends on NETFILTER_NETLINK_QUEUE depends on NETFILTER_NETLINK_QUEUE
depends on NETFILTER_NETLINK_QUEUE_CT depends on NETFILTER_NETLINK_GLUE_CT
depends on NETFILTER_ADVANCED depends on NETFILTER_ADVANCED
help help
This option enables the user-space connection tracking helpers This option enables the user-space connection tracking helpers
@ -362,10 +362,10 @@ config NF_CT_NETLINK_HELPER
If unsure, say `N'. If unsure, say `N'.
config NETFILTER_NETLINK_QUEUE_CT config NETFILTER_NETLINK_GLUE_CT
bool "NFQUEUE integration with Connection Tracking" bool "NFQUEUE integration with Connection Tracking"
default n default n
depends on NETFILTER_NETLINK_QUEUE depends on NETFILTER_NETLINK_QUEUE && NF_CT_NETLINK
help help
If this option is enabled, NFQUEUE can include Connection Tracking If this option is enabled, NFQUEUE can include Connection Tracking
information together with the packet is the enqueued via NFNETLINK. information together with the packet is the enqueued via NFNETLINK.

8
net/netfilter/nf_conntrack_netlink.c
View File

@ -2133,7 +2133,7 @@ ctnetlink_alloc_expect(const struct nlattr *const cda[], struct nf_conn *ct,
struct nf_conntrack_tuple *tuple, struct nf_conntrack_tuple *tuple,
struct nf_conntrack_tuple *mask); struct nf_conntrack_tuple *mask);
#ifdef CONFIG_NETFILTER_NETLINK_QUEUE_CT #ifdef CONFIG_NETFILTER_NETLINK_GLUE_CT
static size_t static size_t
ctnetlink_glue_build_size(const struct nf_conn *ct) ctnetlink_glue_build_size(const struct nf_conn *ct)
{ {
@ -2403,7 +2403,7 @@ static struct nfnl_ct_hook ctnetlink_glue_hook = {
.attach_expect = ctnetlink_glue_attach_expect, .attach_expect = ctnetlink_glue_attach_expect,
.seq_adjust = ctnetlink_glue_seqadj, .seq_adjust = ctnetlink_glue_seqadj,
}; };
#endif /* CONFIG_NETFILTER_NETLINK_QUEUE_CT */ #endif /* CONFIG_NETFILTER_NETLINK_GLUE_CT */
/*********************************************************************** /***********************************************************************
* EXPECT * EXPECT
@ -3387,7 +3387,7 @@ static int __init ctnetlink_init(void)
pr_err("ctnetlink_init: cannot register pernet operations\n"); pr_err("ctnetlink_init: cannot register pernet operations\n");
goto err_unreg_exp_subsys; goto err_unreg_exp_subsys;
} }
#ifdef CONFIG_NETFILTER_NETLINK_QUEUE_CT #ifdef CONFIG_NETFILTER_NETLINK_GLUE_CT
/* setup interaction between nf_queue and nf_conntrack_netlink. */ /* setup interaction between nf_queue and nf_conntrack_netlink. */
RCU_INIT_POINTER(nfnl_ct_hook, &ctnetlink_glue_hook); RCU_INIT_POINTER(nfnl_ct_hook, &ctnetlink_glue_hook);
#endif #endif
@ -3408,7 +3408,7 @@ static void __exit ctnetlink_exit(void)
unregister_pernet_subsys(&ctnetlink_net_ops); unregister_pernet_subsys(&ctnetlink_net_ops);
nfnetlink_subsys_unregister(&ctnl_exp_subsys); nfnetlink_subsys_unregister(&ctnl_exp_subsys);
nfnetlink_subsys_unregister(&ctnl_subsys); nfnetlink_subsys_unregister(&ctnl_subsys);
#ifdef CONFIG_NETFILTER_NETLINK_QUEUE_CT #ifdef CONFIG_NETFILTER_NETLINK_GLUE_CT
RCU_INIT_POINTER(nfnl_ct_hook, NULL); RCU_INIT_POINTER(nfnl_ct_hook, NULL);
#endif #endif
} }