]> git.baikalelectronics.ru Git - kernel.git/commit
netfilter: nf_conntrack_h323: Remove deprecated config check
authorSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Fri, 3 May 2019 18:39:08 +0000 (12:39 -0600)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 6 May 2019 13:15:09 +0000 (15:15 +0200)
commit2ef82fc96b01e7ba5a18544bebacb0262d7d8843
treefe44a99cfaa2fed7b1567c4928048315a7599d4c
parentc556165b23cb2e3525999491fdb537d768f4587c
netfilter: nf_conntrack_h323: Remove deprecated config check

CONFIG_NF_CONNTRACK_IPV6 has been deprecated so replace it with a check
for IPV6 instead.

Use nf_ip6_route6() instead of v6ops->route() and keep the IS_MODULE()
in nf_ipv6_ops as mentioned by Florian so that direct calls are used
when IPV6 is builtin and indirect calls are used only when IPV6 is a
module.

Fixes: 9a24e102c37468 ("netfilter: conntrack: remove l3proto abstraction")
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Reviewed-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nf_conntrack_h323_main.c