leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mpls: Allow mpls_gso and mpls_router to be built as modules

Browse Source 
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>
This commit is contained in:
Robert Shearman
2015-03-10 16:37:59 +00:00
committed by David S. Miller
parent 19693f1166
commit 8a08919f43
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/mpls/Kconfig
View File

@@ -3,7 +3,7 @@
# #
menuconfig MPLS menuconfig MPLS
tristate "MultiProtocol Label Switching" bool "MultiProtocol Label Switching"
default n default n
---help--- ---help---
MultiProtocol Label Switching routes packets through logical MultiProtocol Label Switching routes packets through logical
@@ -16,14 +16,14 @@ menuconfig MPLS
if MPLS if MPLS
config NET_MPLS_GSO config NET_MPLS_GSO
bool "MPLS: GSO support" tristate "MPLS: GSO support"
help help
This is helper module to allow segmentation of non-MPLS GSO packets This is helper module to allow segmentation of non-MPLS GSO packets
that have had MPLS stack entries pushed onto them and thus that have had MPLS stack entries pushed onto them and thus
become MPLS GSO packets. become MPLS GSO packets.
config MPLS_ROUTING config MPLS_ROUTING
bool "MPLS: routing support" tristate "MPLS: routing support"
help help
Add support for forwarding of mpls packets. Add support for forwarding of mpls packets.

4
net/mpls/Makefile
View File

@@ -2,4 +2,6 @@
# Makefile for MPLS. # Makefile for MPLS.
# #
obj-$(CONFIG_NET_MPLS_GSO) += mpls_gso.o 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