openvswitch: Replace removed NF_NAT_NEEDED with IS_ENABLED(CONFIG_NF_NAT)
Subsystems (3)
PATCH 1/1 openvswitch: Replace removed NF_NAT_NEEDED with IS_ENABLED(CONFIG_NF_NAT)
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.
--- net/openvswitch/conntrack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/openvswitch/conntrack.c +2 -2
@@ -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
Signature · 1 line
2.17.1
Quoted 3 lines · Geert Uytterhoeven
Commit
4806e975729f99c7("netfilter: replaceNF_NAT_NEEDEDwithIS_ENABLED(CONFIG_NF_NAT)") removedCONFIG_NF_NAT_NEEDED, but a new user popped up afterwards.
Thnaks for spotting this.
Quoted 7 lines · Geert Uytterhoeven
Commit
4806e975729f99c7("netfilter: replaceNF_NAT_NEEDEDwithIS_ENABLED(CONFIG_NF_NAT)") removedCONFIG_NF_NAT_NEEDED, but a new user popped up afterwards.Fixes fec9c271b8f1bde1 ("openvswitch: load and reference the NAT helper.")Signed-off-by Geert Uytterhoeven <[email protected]>---
Thanks!
From: Geert Uytterhoeven <[email protected]>
Date: Wed, 8 May 2019 08:52:32 +0200
Quoted 6 lines
Commit
4806e975729f99c7("netfilter: replaceNF_NAT_NEEDEDwithIS_ENABLED(CONFIG_NF_NAT)") removedCONFIG_NF_NAT_NEEDED, but a new user popped up afterwards.Fixes fec9c271b8f1bde1 ("openvswitch: load and reference the NAT helper.")Signed-off-by Geert Uytterhoeven <[email protected]>
Applied, thanks.