Re: [PATCH nf-next 1/3] netfilter: built-in NAT support for DCCP

[Pablo Neira Ayuso <pablo@netfilter.org>]

On Thu, Oct 20, 2016 at 12:26:23PM +0200, Davide Caratti wrote:
> CONFIG_NF_NAT_PROTO_DCCP is no more a tristate. When set to y, NAT
> support for DCCP protocol is built-in into nf_nat.ko.
> 
> Signed-off-by: Davide Caratti <dcaratti@redhat.com>
> ---
>  include/net/netfilter/nf_nat_l4proto.h |  3 +++
>  net/netfilter/Kconfig                  |  2 +-
>  net/netfilter/Makefile                 |  3 ++-
>  net/netfilter/nf_nat_core.c            |  4 ++++
>  net/netfilter/nf_nat_proto_dccp.c      | 36 +---------------------------------
>  5 files changed, 11 insertions(+), 37 deletions(-)
> 
> diff --git a/include/net/netfilter/nf_nat_l4proto.h b/include/net/netfilter/nf_nat_l4proto.h
> index 12f4cc8..6328c18 100644
> --- a/include/net/netfilter/nf_nat_l4proto.h
> +++ b/include/net/netfilter/nf_nat_l4proto.h
> @@ -54,6 +54,9 @@ extern const struct nf_nat_l4proto nf_nat_l4proto_udp;
>  extern const struct nf_nat_l4proto nf_nat_l4proto_icmp;
>  extern const struct nf_nat_l4proto nf_nat_l4proto_icmpv6;
>  extern const struct nf_nat_l4proto nf_nat_l4proto_unknown;
> +#if IS_ENABLED(CONFIG_NF_NAT_PROTO_DCCP)

I think you can replace this by:

#ifdef CONFIG_NF_NAT_PROTO_DCCP

given that IS_ENABLED catches the module case too.

This is is just a code readability nitpick, so whoever reads this code
understands that we have no module support for this anymore.