From 4454c7b8548214c53d749ae7ee64b61050f6ec67 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 13 Apr 2018 15:21:57 +0100 Subject: [PATCH] kernel: Enable MPLS_ROUTING and MPLS_IPTUNNEL as modules Signed-off-by: Rolf Neugebauer --- kernel/config-4.14.x-aarch64 | 3 ++- kernel/config-4.14.x-s390x | 3 ++- kernel/config-4.14.x-x86_64 | 3 ++- kernel/config-4.15.x-aarch64 | 3 ++- kernel/config-4.15.x-s390x | 3 ++- kernel/config-4.15.x-x86_64 | 3 ++- kernel/config-4.16.x-aarch64 | 3 ++- kernel/config-4.16.x-s390x | 3 ++- kernel/config-4.16.x-x86_64 | 3 ++- kernel/config-4.4.x-x86_64 | 3 ++- kernel/config-4.9.x-x86_64 | 3 ++- 11 files changed, 22 insertions(+), 11 deletions(-) diff --git a/kernel/config-4.14.x-aarch64 b/kernel/config-4.14.x-aarch64 index de6494cc9..e58cbaef6 100644 --- a/kernel/config-4.14.x-aarch64 +++ b/kernel/config-4.14.x-aarch64 @@ -1232,7 +1232,8 @@ CONFIG_VIRTIO_VSOCKETS_COMMON=y CONFIG_NETLINK_DIAG=y CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m -# CONFIG_MPLS_ROUTING is not set +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m # CONFIG_NET_NSH is not set # CONFIG_HSR is not set CONFIG_NET_SWITCHDEV=y diff --git a/kernel/config-4.14.x-s390x b/kernel/config-4.14.x-s390x index 873aaa4d6..7f7a7a76f 100644 --- a/kernel/config-4.14.x-s390x +++ b/kernel/config-4.14.x-s390x @@ -1165,7 +1165,8 @@ CONFIG_VIRTIO_VSOCKETS_COMMON=y CONFIG_NETLINK_DIAG=y CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m -# CONFIG_MPLS_ROUTING is not set +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m # CONFIG_NET_NSH is not set # CONFIG_HSR is not set CONFIG_NET_SWITCHDEV=y diff --git a/kernel/config-4.14.x-x86_64 b/kernel/config-4.14.x-x86_64 index 4d4a1f625..783e6daad 100644 --- a/kernel/config-4.14.x-x86_64 +++ b/kernel/config-4.14.x-x86_64 @@ -1393,7 +1393,8 @@ CONFIG_HYPERV_VSOCKETS=y CONFIG_NETLINK_DIAG=y CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m -# CONFIG_MPLS_ROUTING is not set +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m # CONFIG_NET_NSH is not set # CONFIG_HSR is not set CONFIG_NET_SWITCHDEV=y diff --git a/kernel/config-4.15.x-aarch64 b/kernel/config-4.15.x-aarch64 index b47d3501b..7d2737b8d 100644 --- a/kernel/config-4.15.x-aarch64 +++ b/kernel/config-4.15.x-aarch64 @@ -1244,7 +1244,8 @@ CONFIG_VIRTIO_VSOCKETS_COMMON=y CONFIG_NETLINK_DIAG=y CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m -# CONFIG_MPLS_ROUTING is not set +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m CONFIG_NET_NSH=m # CONFIG_HSR is not set CONFIG_NET_SWITCHDEV=y diff --git a/kernel/config-4.15.x-s390x b/kernel/config-4.15.x-s390x index a1c36fce8..d45ab6465 100644 --- a/kernel/config-4.15.x-s390x +++ b/kernel/config-4.15.x-s390x @@ -1178,7 +1178,8 @@ CONFIG_VIRTIO_VSOCKETS_COMMON=y CONFIG_NETLINK_DIAG=y CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m -# CONFIG_MPLS_ROUTING is not set +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m CONFIG_NET_NSH=m # CONFIG_HSR is not set CONFIG_NET_SWITCHDEV=y diff --git a/kernel/config-4.15.x-x86_64 b/kernel/config-4.15.x-x86_64 index 5cbcd36dd..33f9af9a0 100644 --- a/kernel/config-4.15.x-x86_64 +++ b/kernel/config-4.15.x-x86_64 @@ -1398,7 +1398,8 @@ CONFIG_HYPERV_VSOCKETS=y CONFIG_NETLINK_DIAG=y CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m -# CONFIG_MPLS_ROUTING is not set +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m CONFIG_NET_NSH=m # CONFIG_HSR is not set CONFIG_NET_SWITCHDEV=y diff --git a/kernel/config-4.16.x-aarch64 b/kernel/config-4.16.x-aarch64 index fc770867f..73112b272 100644 --- a/kernel/config-4.16.x-aarch64 +++ b/kernel/config-4.16.x-aarch64 @@ -1255,7 +1255,8 @@ CONFIG_VIRTIO_VSOCKETS_COMMON=y CONFIG_NETLINK_DIAG=y CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m -# CONFIG_MPLS_ROUTING is not set +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m CONFIG_NET_NSH=m # CONFIG_HSR is not set CONFIG_NET_SWITCHDEV=y diff --git a/kernel/config-4.16.x-s390x b/kernel/config-4.16.x-s390x index c8f4cdf58..889c53994 100644 --- a/kernel/config-4.16.x-s390x +++ b/kernel/config-4.16.x-s390x @@ -1184,7 +1184,8 @@ CONFIG_VIRTIO_VSOCKETS_COMMON=y CONFIG_NETLINK_DIAG=y CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m -# CONFIG_MPLS_ROUTING is not set +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m CONFIG_NET_NSH=m # CONFIG_HSR is not set CONFIG_NET_SWITCHDEV=y diff --git a/kernel/config-4.16.x-x86_64 b/kernel/config-4.16.x-x86_64 index 59ffd1288..aa59c9809 100644 --- a/kernel/config-4.16.x-x86_64 +++ b/kernel/config-4.16.x-x86_64 @@ -1411,7 +1411,8 @@ CONFIG_HYPERV_VSOCKETS=y CONFIG_NETLINK_DIAG=y CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m -# CONFIG_MPLS_ROUTING is not set +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m CONFIG_NET_NSH=m # CONFIG_HSR is not set CONFIG_NET_SWITCHDEV=y diff --git a/kernel/config-4.4.x-x86_64 b/kernel/config-4.4.x-x86_64 index 2479fc638..d462be971 100644 --- a/kernel/config-4.4.x-x86_64 +++ b/kernel/config-4.4.x-x86_64 @@ -1232,7 +1232,8 @@ CONFIG_VSOCKETS=y CONFIG_NETLINK_DIAG=y CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m -# CONFIG_MPLS_ROUTING is not set +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m # CONFIG_HSR is not set CONFIG_NET_SWITCHDEV=y CONFIG_NET_L3_MASTER_DEV=y diff --git a/kernel/config-4.9.x-x86_64 b/kernel/config-4.9.x-x86_64 index c7058f559..0ed80ef4b 100644 --- a/kernel/config-4.9.x-x86_64 +++ b/kernel/config-4.9.x-x86_64 @@ -1304,7 +1304,8 @@ CONFIG_HYPERV_SOCK=y CONFIG_NETLINK_DIAG=y CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m -# CONFIG_MPLS_ROUTING is not set +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m # CONFIG_HSR is not set CONFIG_NET_SWITCHDEV=y CONFIG_NET_L3_MASTER_DEV=y