Message ID | 1571160473-46132-11-git-send-email-yihung.wei@gmail.com |
---|---|
State | Accepted |
Commit | 0b26ee1b475b5395a7a3fe79defeb4928d1e5a6f |
Headers | show |
Series | Backport upstream conntrack related patches | expand |
Bleep bloop. Greetings Yi-Hung Wei, I am a robot and I have tried out your patch. Thanks for your contribution. I encountered some error that I wasn't expecting. See the details below. checkpatch: ERROR: Author Geert Uytterhoeven <geert@linux-m68k.org> needs to sign off. WARNING: Unexpected sign-offs from developers who are not authors or co-authors or committers: Yi-Hung Wei <yihung.wei@gmail.com> Lines checked: 55, Warnings: 1, Errors: 1 Please check this out. If you feel there has been an error, please email aconole@redhat.com Thanks, 0-day Robot
diff --git a/datapath/conntrack.c b/datapath/conntrack.c index 86e7dd24bb9b..ba73962b2214 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -1406,7 +1406,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_NEEDED) if (info->nat) { ret = nf_nat_helper_try_module_get(name, info->family, key->ip.proto); @@ -1909,7 +1909,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_NEEDED) if (ct_info->nat) nf_nat_helper_put(ct_info->helper); #endif