Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83f3e94d authored by Ken-ichirou MATSUZAWA's avatar Ken-ichirou MATSUZAWA Committed by Pablo Neira Ayuso
Browse files

netfilter: Kconfig rename QUEUE_CT to GLUE_CT 



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: default avatarKen-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent a4b4766c

net/netfilter/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ config NF_CT_NETLINK_HELPER 
	select NETFILTER_NETLINK

	depends on NF_CT_NETLINK

	depends on NETFILTER_NETLINK_QUEUE

	depends on NETFILTER_NETLINK_QUEUE_CT

	depends on NETFILTER_NETLINK_GLUE_CT

	depends on NETFILTER_ADVANCED

	help

	  This option enables the user-space connection tracking helpers
@@ -362,10 +362,10 @@ config NF_CT_NETLINK_HELPER 


	  If unsure, say `N'.



config NETFILTER_NETLINK_QUEUE_CT

config NETFILTER_NETLINK_GLUE_CT

	bool "NFQUEUE integration with Connection Tracking"

	default n

        depends on NETFILTER_NETLINK_QUEUE

	depends on NETFILTER_NETLINK_QUEUE && NF_CT_NETLINK

	help

	  If this option is enabled, NFQUEUE can include Connection Tracking

	  information together with the packet is the enqueued via NFNETLINK.

net/netfilter/nf_conntrack_netlink.c

+4 −4
Original line number Diff line number Diff line
@@ -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 *mask);



#ifdef CONFIG_NETFILTER_NETLINK_QUEUE_CT

#ifdef CONFIG_NETFILTER_NETLINK_GLUE_CT

static size_t

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,

	.seq_adjust	= ctnetlink_glue_seqadj,

};

#endif /* CONFIG_NETFILTER_NETLINK_QUEUE_CT */

#endif /* CONFIG_NETFILTER_NETLINK_GLUE_CT */



/***********************************************************************

 * EXPECT
@@ -3387,7 +3387,7 @@ static int __init ctnetlink_init(void) 
		pr_err("ctnetlink_init: cannot register pernet operations\n");

		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. */

	RCU_INIT_POINTER(nfnl_ct_hook, &ctnetlink_glue_hook);

#endif
@@ -3408,7 +3408,7 @@ static void __exit ctnetlink_exit(void) 
	unregister_pernet_subsys(&ctnetlink_net_ops);

	nfnetlink_subsys_unregister(&ctnl_exp_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);

#endif

}