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.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
