summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Shearman <rshearma@brocade.com>2015-03-10 16:37:59 +0000
committerDavid S. Miller <davem@davemloft.net>2015-03-11 16:38:54 -0400
commit8a08919f43d9955d5afc5d6b416964401e3c58d8 (patch)
tree489b040e5c3be91081d5a4fedaa121478457efc4
parent19693f1166a421e628136ecc279bb4a076b753eb (diff)
mpls: Allow mpls_gso and mpls_router to be built as modules
CONFIG_MPLS=m doesn't result in a kernel module being built because it applies to the net/mpls directory, rather than to .o files. So revert the MPLS menuitem to being a boolean and make MPLS_GSO and MPLS_ROUTING tristates to allow mpls_gso and mpls_router modules to be produced as desired. Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Robert Shearman <rshearma@brocade.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/mpls/Kconfig6
-rw-r--r--net/mpls/Makefile4
2 files changed, 6 insertions, 4 deletions
diff --git a/net/mpls/Kconfig b/net/mpls/Kconfig
index dfca485863e9..17bde799c854 100644
--- a/net/mpls/Kconfig
+++ b/net/mpls/Kconfig
@@ -3,7 +3,7 @@
#
menuconfig MPLS
- tristate "MultiProtocol Label Switching"
+ bool "MultiProtocol Label Switching"
default n
---help---
MultiProtocol Label Switching routes packets through logical
@@ -16,14 +16,14 @@ menuconfig MPLS
if MPLS
config NET_MPLS_GSO
- bool "MPLS: GSO support"
+ tristate "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.
config MPLS_ROUTING
- bool "MPLS: routing support"
+ tristate "MPLS: routing support"
help
Add support for forwarding of mpls packets.
diff --git a/net/mpls/Makefile b/net/mpls/Makefile
index 60af15f1960e..65bbe68c72e6 100644
--- a/net/mpls/Makefile
+++ b/net/mpls/Makefile
@@ -2,4 +2,6 @@
# Makefile for MPLS.
#
obj-$(CONFIG_NET_MPLS_GSO) += mpls_gso.o
-obj-$(CONFIG_MPLS_ROUTING) += af_mpls.o
+obj-$(CONFIG_MPLS_ROUTING) += mpls_router.o
+
+mpls_router-y := af_mpls.o