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

mpls: Refactor how the mpls module is built

Browse Source 
This refactoring is needed to allow more than just mpls gso
support to be built into the mpls moddule.

Reviewed-by: Simon Horman <horms@verge.net.au>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric W. Biederman 2015-03-03 19:10:23 -06:00 committed by David S. Miller
parent ee23393b40
commit cec9166ca4
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/Makefile
View File

@ -69,7 +69,7 @@ obj-$(CONFIG_BATMAN_ADV) += batman-adv/
obj-$(CONFIG_NFC) += nfc/ obj-$(CONFIG_NFC) += nfc/
obj-$(CONFIG_OPENVSWITCH) += openvswitch/ obj-$(CONFIG_OPENVSWITCH) += openvswitch/
obj-$(CONFIG_VSOCKETS) += vmw_vsock/ obj-$(CONFIG_VSOCKETS) += vmw_vsock/
obj-$(CONFIG_NET_MPLS_GSO) += mpls/ obj-$(CONFIG_MPLS) += mpls/
obj-$(CONFIG_HSR) += hsr/ obj-$(CONFIG_HSR) += hsr/
ifneq ($(CONFIG_NET_SWITCHDEV),) ifneq ($(CONFIG_NET_SWITCHDEV),)
obj-y += switchdev/ obj-y += switchdev/

18
net/mpls/Kconfig
View File

@ -1,9 +1,25 @@
# #
# MPLS configuration # 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 config NET_MPLS_GSO
tristate "MPLS: GSO support" bool "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.
endif # MPLS