Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751835AbcCQDSY (ORCPT ); Wed, 16 Mar 2016 23:18:24 -0400 Received: from slow1-d.mail.gandi.net ([217.70.178.86]:50382 "EHLO slow1-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750852AbcCQDSX (ORCPT ); Wed, 16 Mar 2016 23:18:23 -0400 X-Originating-IP: 74.125.82.42 MIME-Version: 1.0 In-Reply-To: <1458132481-318209-1-git-send-email-arnd@arndb.de> References: <1458132481-318209-1-git-send-email-arnd@arndb.de> From: Joe Stringer Date: Thu, 17 Mar 2016 16:09:18 +1300 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [ovs-dev] [PATCH] openvswitch: call only into reachable nf-nat code To: Arnd Bergmann Cc: Pablo Neira Ayuso , Pravin Shelar , "David S. Miller" , ovs dev , netdev , linux-kernel@vger.kernel.org, Joe Stringer , Paolo Abeni Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1534 Lines: 36 On 17 March 2016 at 01:47, Arnd Bergmann wrote: > The openvswitch code has gained support for calling into the > nf-nat-ipv4/ipv6 modules, however those can be loadable modules > in a configuration in which openvswitch is built-in, leading > to link errors: > > net/built-in.o: In function `__ovs_ct_lookup': > :(.text+0x2cc2c8): undefined reference to `nf_nat_icmp_reply_translation' > :(.text+0x2cc66c): undefined reference to `nf_nat_icmpv6_reply_translation' > > The dependency on (!NF_NAT || NF_NAT) was meant to prevent > this, but NF_NAT is set to 'y' if any of the symbols selecting > it are built-in, but the link error happens when any of them > are modular. > > A second issue is that even if CONFIG_NF_NAT_IPV6 is built-in, > CONFIG_NF_NAT_IPV4 might be completely disabled. This is unlikely > to be useful in practice, but the driver currently only handles > IPv6 being optional. > > This patch improves the Kconfig dependency so that openvswitch > cannot be built-in if either of the two other symbols are set > to 'm', and it replaces the incorrect #ifdef in ovs_ct_nat_execute() > with two "if (IS_ENABLED())" checks that should catch all corner > cases also make the code more readable. > > The same #ifdef exists ovs_ct_nat_to_attr(), where it does not > cause a link error, but for consistency I'm changing it the same > way. > > Signed-off-by: Arnd Bergmann > Fixes: 05752523e565 ("openvswitch: Interface with NAT.") Thanks for the fix, LGTM. Acked-by: Joe Stringer