commit edd716b2659e631fd6fe0edbc00fa4a29606b095
author Oleksandr Tymoshenko <ovt@google.com> Fri Jul 21 07:22:21 2023 +0000
committer Oleksandr Tymoshenko <ovt@google.com> Tue Jul 25 20:04:44 2023 +0000
tree cf061dfd3e560bff3b52990f8bb5660a55e36948
parent 3c3cf838f3aedfc843de324e6f1d156bf3fe6192

lakitu_defconfig: enable tunneling modules

Enable the following modules:
  - vrf
  - ip_gre
  - ip6_gre

BUG=b/290252422
TEST=presubmit
RELEASE_NOTE=Enabled vrf, ip_gre, and ip6_gre modules

Change-Id: I246db1fb7832b3419c748e940c6fc406fd2f6a02
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/52433
Tested-by: Oleksandr Tymoshenko <ovt@google.com>
Reviewed-by: Vaibhav Rustagi <vaibhavrustagi@google.com>

arch/arm64/configs/lakitu_defconfig

diff --git a/arch/arm64/configs/lakitu_defconfig b/arch/arm64/configs/lakitu_defconfig
index 921cbca..0462402 100644
--- a/arch/arm64/configs/lakitu_defconfig
+++ b/arch/arm64/configs/lakitu_defconfig
@@ -1042,8 +1042,10 @@
 CONFIG_IP_ROUTE_CLASSID=y
 # CONFIG_IP_PNP is not set
 CONFIG_NET_IPIP=m
-# CONFIG_NET_IPGRE_DEMUX is not set
+CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+# CONFIG_NET_IPGRE_BROADCAST is not set
 CONFIG_IP_MROUTE_COMMON=y
 CONFIG_IP_MROUTE=y
 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
@@ -1102,6 +1104,7 @@
 # CONFIG_IPV6_VTI is not set
 # CONFIG_IPV6_SIT is not set
 CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
 CONFIG_IPV6_FOU=m
 CONFIG_IPV6_FOU_TUNNEL=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
@@ -2213,7 +2216,7 @@
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=y
 # CONFIG_NLMON is not set
-# CONFIG_NET_VRF is not set
+CONFIG_NET_VRF=m
 # CONFIG_ARCNET is not set
 CONFIG_ETHERNET=y
 # CONFIG_NET_VENDOR_3COM is not set
@@ -2425,6 +2428,7 @@
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPPOE is not set
+# CONFIG_PPTP is not set
 CONFIG_PPP_ASYNC=m
 # CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_SLIP is not set

arch/x86/configs/lakitu_defconfig

diff --git a/arch/x86/configs/lakitu_defconfig b/arch/x86/configs/lakitu_defconfig
index 0027310..1e12a1b 100644
--- a/arch/x86/configs/lakitu_defconfig
+++ b/arch/x86/configs/lakitu_defconfig
@@ -1079,8 +1079,10 @@
 CONFIG_IP_ROUTE_CLASSID=y
 # CONFIG_IP_PNP is not set
 CONFIG_NET_IPIP=m
-# CONFIG_NET_IPGRE_DEMUX is not set
+CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+# CONFIG_NET_IPGRE_BROADCAST is not set
 CONFIG_IP_MROUTE_COMMON=y
 CONFIG_IP_MROUTE=y
 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
@@ -1139,6 +1141,7 @@
 # CONFIG_IPV6_VTI is not set
 # CONFIG_IPV6_SIT is not set
 CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
 CONFIG_IPV6_FOU=m
 CONFIG_IPV6_FOU_TUNNEL=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
@@ -2228,7 +2231,7 @@
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=y
 # CONFIG_NLMON is not set
-# CONFIG_NET_VRF is not set
+CONFIG_NET_VRF=m
 # CONFIG_ARCNET is not set
 CONFIG_ETHERNET=y
 # CONFIG_NET_VENDOR_3COM is not set
@@ -2427,6 +2430,7 @@
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPPOE is not set
+# CONFIG_PPTP is not set
 CONFIG_PPP_ASYNC=m
 # CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_SLIP is not set