Linux Netfilter development
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Duan Jiong <duanj.fnst@cn.fujitsu.com>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH v2] netfilter: use IS_ENABLED() macro
Date: Mon, 30 Jun 2014 11:43:15 +0200	[thread overview]
Message-ID: <20140630094315.GA4604@localhost> (raw)
In-Reply-To: <53B0BB24.2060201@cn.fujitsu.com>

On Mon, Jun 30, 2014 at 09:19:32AM +0800, Duan Jiong wrote:
> 
> replace:
>  #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
> with
>  #if IS_ENABLED(CONFIG_NF_CT_NETLINK)
> 
> replace:
>  #if !defined(CONFIG_NF_NAT) && !defined(CONFIG_NF_NAT_MODULE)
> with
>  #if !IS_ENABLED(CONFIG_NF_NAT)

Applied.

I have also appended to the patch description this:

    replace:
     #if !defined(CONFIG_NF_CONNTRACK) &&
!defined(CONFIG_NF_CONNTRACK_MODULE)
    with
     #if !IS_ENABLED(CONFIG_NF_CONNTRACK)

And I have squashed this patch:

http://patchwork.ozlabs.org/patch/364781/

I think it was too small for two patches which are really related. And
I also appended this:

    And add missing:
     IS_ENABLED(CONFIG_NF_CT_NETLINK)

    in net/ipv{4,6}/netfilter/nf_nat_l3proto_ipv{4,6}.c

Final patch is here:

http://git.kernel.org/cgit/linux/kernel/git/pablo/nf-next.git/commit/?id=24de3d377539e384621c5b8f8f8d8d01852dddc8

Thanks.

      reply	other threads:[~2014-06-30  9:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-30  1:19 [PATCH v2] netfilter: use IS_ENABLED() macro Duan Jiong
2014-06-30  9:43 ` Pablo Neira Ayuso [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140630094315.GA4604@localhost \
    --to=pablo@netfilter.org \
    --cc=duanj.fnst@cn.fujitsu.com \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox