From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: Re: [PATCH v2] openvswitch: Add Kconfig dependency on GRE-DEMUX. Date: Fri, 28 Jun 2013 14:00:41 -0700 Message-ID: <51CDF979.7040605@infradead.org> References: <1372448395-30095-1-git-send-email-pshelar@nicira.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, dev@openvswitch.org, bhutchings@solarflare.com, Jesse Gross To: Pravin B Shelar Return-path: Received: from merlin.infradead.org ([205.233.59.134]:60613 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750810Ab3F1VBM (ORCPT ); Fri, 28 Jun 2013 17:01:12 -0400 In-Reply-To: <1372448395-30095-1-git-send-email-pshelar@nicira.com> Sender: netdev-owner@vger.kernel.org List-ID: On 06/28/13 12:39, Pravin B Shelar wrote: > Openvswitch uses function from NET_IPGRE_DEMUX module. > Add Kconfig dependency to fix following compilation errors: > http://marc.info/?l=linux-netdev&m=137244035226634 > > CC: Jesse Gross > Reported-by: Randy Dunlap > Signed-off-by: Pravin Shelar Well, that works if CONFIG_INET is enabled, but if I disable that kconfig symbol and then rebuild, this is what happens: net/openvswitch/vport-gre.c: In function 'gre_tnl_send': net/openvswitch/vport-gre.c:179:2: error: implicit declaration of function 'iptunnel_xmit' [-Werror=implicit-function-declaration] > --- > v1-v2: > - use select to resolve dependency. > --- > net/openvswitch/Kconfig | 1 + > net/openvswitch/vport-gre.c | 2 -- > net/openvswitch/vport.c | 3 --- > 3 files changed, 1 insertions(+), 5 deletions(-) > > diff --git a/net/openvswitch/Kconfig b/net/openvswitch/Kconfig > index 9fbc04a..deaa9bb 100644 > --- a/net/openvswitch/Kconfig > +++ b/net/openvswitch/Kconfig > @@ -4,6 +4,7 @@ > > config OPENVSWITCH > tristate "Open vSwitch" > + select NET_IPGRE_DEMUX > ---help--- > Open vSwitch is a multilayer Ethernet switch targeted at virtualized > environments. In addition to supporting a variety of features > diff --git a/net/openvswitch/vport-gre.c b/net/openvswitch/vport-gre.c > index 943e5c4..21d5073 100644 > --- a/net/openvswitch/vport-gre.c > +++ b/net/openvswitch/vport-gre.c > @@ -16,7 +16,6 @@ > * 02110-1301, USA > */ > > -#if IS_ENABLED(CONFIG_NET_IPGRE_DEMUX) > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > #include > @@ -271,4 +270,3 @@ const struct vport_ops ovs_gre_vport_ops = { > .get_name = gre_get_name, > .send = gre_tnl_send, > }; > -#endif > diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c > index ba81294..ba240a8 100644 > --- a/net/openvswitch/vport.c > +++ b/net/openvswitch/vport.c > @@ -38,10 +38,7 @@ > static const struct vport_ops *vport_ops_list[] = { > &ovs_netdev_vport_ops, > &ovs_internal_vport_ops, > - > -#if IS_ENABLED(CONFIG_NET_IPGRE_DEMUX) > &ovs_gre_vport_ops, > -#endif > }; > > /* Protected by RCU read lock for reading, ovs_mutex for writing. */ > -- ~Randy