From: Simon Horman Subject: Re: [PATCH net-next 1/8] mpls: Refactor how the mpls module is built Date: Thu, 26 Feb 2015 11:05:04 +0900 Message-ID: <20150226020504.GA935@verge.net.au> References: <87pp8xx6ik.fsf@x220.int.ebiederm.org> <87k2z5x6ch.fsf@x220.int.ebiederm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: David Miller , netdev@vger.kernel.org, roopa , Stephen Hemminger , santiago@crfreenet.org To: "Eric W. Biederman" Return-path: Received: from kirsty.vergenet.net ([202.4.237.240]:60083 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752879AbbBZCFI (ORCPT ); Wed, 25 Feb 2015 21:05:08 -0500 Content-Disposition: inline In-Reply-To: <87k2z5x6ch.fsf@x220.int.ebiederm.org> Sender: netdev-owner@vger.kernel.org List-ID: On Wed, Feb 25, 2015 at 11:13:02AM -0600, Eric W. Biederman wrote: > > This refactoring is needed to allow more than just mpls gso support to > be built into the mpls moddule. > > Signed-off-by: "Eric W. Biederman" > --- > net/Makefile | 2 +- > net/mpls/Kconfig | 18 +++++++++++++++++- > 2 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/net/Makefile b/net/Makefile > index 38704bdf941a..3995613e5510 100644 > --- a/net/Makefile > +++ b/net/Makefile > @@ -69,7 +69,7 @@ obj-$(CONFIG_BATMAN_ADV) += batman-adv/ > obj-$(CONFIG_NFC) += nfc/ > obj-$(CONFIG_OPENVSWITCH) += openvswitch/ > obj-$(CONFIG_VSOCKETS) += vmw_vsock/ > -obj-$(CONFIG_NET_MPLS_GSO) += mpls/ > +obj-$(CONFIG_MPLS) += mpls/ > obj-$(CONFIG_HSR) += hsr/ > ifneq ($(CONFIG_NET_SWITCHDEV),) > obj-y += switchdev/ > diff --git a/net/mpls/Kconfig b/net/mpls/Kconfig > index 37421db88965..a77fbcdd04ee 100644 > --- a/net/mpls/Kconfig > +++ b/net/mpls/Kconfig > @@ -1,9 +1,25 @@ > # > # MPLS configuration > # > + > +menuconfig MPLS > + tristate "MultiProtocol Label Switching" > + default n > + ---help--- > + MultiProtocol Label Switching routes packets through logical > + circuits. Originally conceved as a way of routing packets at > + hardware speeds (before hardware was capable of routing ipv4 packets), > + MPLS remains as simple way of making tunnels. > + > + If you have not heard of MPLS you probably want to say N here. > + > +if MPLS > + > config NET_MPLS_GSO > - tristate "MPLS: GSO support" > + bool "MPLS: GSO support" > help > This is helper module to allow segmentation of non-MPLS GSO packets > that have had MPLS stack entries pushed onto them and thus > become MPLS GSO packets. > + > +endif # MPLS Is the implication here that MPLS must be selected to allow NET_MPLS_GSO to be selected? That is if NET_MPLS_GSO is to be used to handle MPLS packets emitted by OVS then now MPLS also needs to be selected?