* [PATCH] openvswitch: Replace removed NF_NAT_NEEDED with IS_ENABLED(CONFIG_NF_NAT)
@ 2019-05-08 6:52 Geert Uytterhoeven
2019-05-08 9:59 ` Florian Westphal
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2019-05-08 6:52 UTC (permalink / raw)
To: Pravin B Shelar, David S . Miller, Florian Westphal,
Flavio Leitner, Pablo Neira Ayuso
Cc: netdev, dev, linux-kernel, Geert Uytterhoeven
Commit 4806e975729f99c7 ("netfilter: replace NF_NAT_NEEDED with
IS_ENABLED(CONFIG_NF_NAT)") removed CONFIG_NF_NAT_NEEDED, but a new user
popped up afterwards.
Fixes: fec9c271b8f1bde1 ("openvswitch: load and reference the NAT helper.")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
net/openvswitch/conntrack.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 333ec5f298fe5fe8..4c597a0bb1683be3 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -1322,7 +1322,7 @@ static int ovs_ct_add_helper(struct ovs_conntrack_info *info, const char *name,
return -ENOMEM;
}
-#ifdef CONFIG_NF_NAT_NEEDED
+#if IS_ENABLED(CONFIG_NF_NAT)
if (info->nat) {
ret = nf_nat_helper_try_module_get(name, info->family,
key->ip.proto);
@@ -1811,7 +1811,7 @@ void ovs_ct_free_action(const struct nlattr *a)
static void __ovs_ct_free_action(struct ovs_conntrack_info *ct_info)
{
if (ct_info->helper) {
-#ifdef CONFIG_NF_NAT_NEEDED
+#if IS_ENABLED(CONFIG_NF_NAT)
if (ct_info->nat)
nf_nat_helper_put(ct_info->helper);
#endif
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] openvswitch: Replace removed NF_NAT_NEEDED with IS_ENABLED(CONFIG_NF_NAT)
2019-05-08 6:52 [PATCH] openvswitch: Replace removed NF_NAT_NEEDED with IS_ENABLED(CONFIG_NF_NAT) Geert Uytterhoeven
@ 2019-05-08 9:59 ` Florian Westphal
2019-05-08 11:50 ` Flavio Leitner
2019-05-08 16:43 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Florian Westphal @ 2019-05-08 9:59 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Pravin B Shelar, David S . Miller, Florian Westphal,
Flavio Leitner, Pablo Neira Ayuso, netdev, dev, linux-kernel
Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> Commit 4806e975729f99c7 ("netfilter: replace NF_NAT_NEEDED with
> IS_ENABLED(CONFIG_NF_NAT)") removed CONFIG_NF_NAT_NEEDED, but a new user
> popped up afterwards.
Thnaks for spotting this.
Acked-by: Florian Westphal <fw@strlen.de>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] openvswitch: Replace removed NF_NAT_NEEDED with IS_ENABLED(CONFIG_NF_NAT)
2019-05-08 6:52 [PATCH] openvswitch: Replace removed NF_NAT_NEEDED with IS_ENABLED(CONFIG_NF_NAT) Geert Uytterhoeven
2019-05-08 9:59 ` Florian Westphal
@ 2019-05-08 11:50 ` Flavio Leitner
2019-05-08 16:43 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Flavio Leitner @ 2019-05-08 11:50 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Pravin B Shelar, David S . Miller, Florian Westphal,
Pablo Neira Ayuso, netdev, dev, linux-kernel
On Wed, May 08, 2019 at 08:52:32AM +0200, Geert Uytterhoeven wrote:
> Commit 4806e975729f99c7 ("netfilter: replace NF_NAT_NEEDED with
> IS_ENABLED(CONFIG_NF_NAT)") removed CONFIG_NF_NAT_NEEDED, but a new user
> popped up afterwards.
>
> Fixes: fec9c271b8f1bde1 ("openvswitch: load and reference the NAT helper.")
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
Thanks!
Acked-by: Flavio Leitner <fbl@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] openvswitch: Replace removed NF_NAT_NEEDED with IS_ENABLED(CONFIG_NF_NAT)
2019-05-08 6:52 [PATCH] openvswitch: Replace removed NF_NAT_NEEDED with IS_ENABLED(CONFIG_NF_NAT) Geert Uytterhoeven
2019-05-08 9:59 ` Florian Westphal
2019-05-08 11:50 ` Flavio Leitner
@ 2019-05-08 16:43 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2019-05-08 16:43 UTC (permalink / raw)
To: geert; +Cc: pshelar, fw, fbl, pablo, netdev, dev, linux-kernel
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Wed, 8 May 2019 08:52:32 +0200
> Commit 4806e975729f99c7 ("netfilter: replace NF_NAT_NEEDED with
> IS_ENABLED(CONFIG_NF_NAT)") removed CONFIG_NF_NAT_NEEDED, but a new user
> popped up afterwards.
>
> Fixes: fec9c271b8f1bde1 ("openvswitch: load and reference the NAT helper.")
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-08 16:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-08 6:52 [PATCH] openvswitch: Replace removed NF_NAT_NEEDED with IS_ENABLED(CONFIG_NF_NAT) Geert Uytterhoeven
2019-05-08 9:59 ` Florian Westphal
2019-05-08 11:50 ` Flavio Leitner
2019-05-08 16:43 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).