Skip to contentSkip to conversation

netfilter: nf_conntrack_h323: Remove deprecated config check

PATCH Superseded Subash Abhinov Kasiviswanathan 2 participants 3 messages May 3, 2019

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 netfilter: nf_conntrack_h323: Remove deprecated config check

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

Fixes a0ae2562c6c4b2 ("netfilter: conntrack: remove l3proto abstraction")
---
 include/linux/netfilter_ipv6.h         | 2 +-
 net/netfilter/nf_conntrack_h323_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/netfilter_ipv6.h +1 -1
index 12113e5..61f7ac9 100644
@@ -25,7 +25,7 @@ struct ip6_rt_info {
  * if IPv6 is a module.
  */
 struct nf_ipv6_ops {
-#if IS_MODULE(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_IPV6)
 	int (*chk_addr)(struct net *net, const struct in6_addr *addr,
 			const struct net_device *dev, int strict);
 	int (*route_me_harder)(struct net *net, struct sk_buff *skb);
net/netfilter/nf_conntrack_h323_main.c +1 -1
index 005589c..1c6769b 100644
@@ -748,7 +748,7 @@ static int callforward_do_filter(struct net *net,
 		}
 		break;
 	}
-#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
+#if IS_ENABLED(CONFIG_IPV6)
 	case AF_INET6: {
 		const struct nf_ipv6_ops *v6ops;
 		struct rt6_info *rt1, *rt2;
Signature · 1 line
1.9.1
maintainer
#1 lore raw
Quoted 2 lines · Subash Abhinov Kasiviswanathan

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

Right, I missed this part somehow.

Quoted 12 lines
Fixes a0ae2562c6c4b2 ("netfilter: conntrack: remove l3proto abstraction")
---
 include/linux/netfilter_ipv6.h         | 2 +-
 net/netfilter/nf_conntrack_h323_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/netfilter_ipv6.h +0 -0
index 12113e5..61f7ac9 100644

include/linux/netfilter_ipv6.h struct ip6_rt_info { · line 28

Quoted 5 lines
include/linux/netfilter_ipv6.h +1 -1
@@ -25,7 +25,7 @@ struct ip6_rt_info {
  * if IPv6 is a module.
  */
 struct nf_ipv6_ops {
-#if IS_MODULE(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_IPV6)

I would prefer if we could keep this as IS_ENABLED().

net/netfilter/nf_conntrack_h323_main.c static int callforward_do_filter(struct net *net, · line 754

Quoted 13 lines
net/netfilter/nf_conntrack_h323_main.c +1 -1
index 005589c..1c6769b 100644
@@ -748,7 +748,7 @@ static int callforward_do_filter(struct net *net,
 		}
 		break;
 	}
-#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
+#if IS_ENABLED(CONFIG_IPV6)
 	case AF_INET6: {
 		const struct nf_ipv6_ops *v6ops;
 		struct rt6_info *rt1, *rt2;

This branch should use nf_ip6_route() instead of v6ops->route().

maintainer
#2 lore raw
Quoted 13 lines · Florian Westphal
Quoted 2 lines · Subash Abhinov Kasiviswanathan

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

Right, I missed this part somehow.

Quoted 7 lines
Fixes a0ae2562c6c4b2 ("netfilter: conntrack: remove l3proto abstraction")
---
 include/linux/netfilter_ipv6.h         | 2 +-
 net/netfilter/nf_conntrack_h323_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Quoted 12 lines

include/linux/netfilter_ipv6.h struct ip6_rt_info { · line 28

Quoted 10 lines
include/linux/netfilter_ipv6.h +1 -1
index 12113e5..61f7ac9 100644
@@ -25,7 +25,7 @@ struct ip6_rt_info {
  * if IPv6 is a module.
  */
 struct nf_ipv6_ops {
-#if IS_MODULE(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_IPV6)

I would prefer if we could keep this as IS_ENABLED().

Sigh, I meant 'keep IS_MODULE()'.

The callbacks protected by IS_MODULE(IPV6) are not needed when ipv6 is builtin because the functions they would point to can be called directly instead.

We provide wrappers to encap the 'direct or indirect call' decision, e.g. nf_ip6_route() will use the indirection only when ipv6 is a module.