sys-kernel/lakitu-kernel-5_10: enable ipip and fou kernel modules
Enable modules that are required for creating GUE virtual tunnels
BUG=b/200702146
TEST=presubmit
RELEASE_NOTE=Enable ipip and fou kernel modules
Change-Id: Ided9e7bbc18431c7778d62c401a08aaf1ec470f8
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/23470
Reviewed-by: Roy Yang <royyang@google.com>
Reviewed-by: Meena Shanmugam <meenashanmugam@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/project-lakitu/sys-kernel/lakitu-kernel-5_10/files/base.config-arm64 b/project-lakitu/sys-kernel/lakitu-kernel-5_10/files/base.config-arm64
index 2dafb1f..3d780b8 100644
--- a/project-lakitu/sys-kernel/lakitu-kernel-5_10/files/base.config-arm64
+++ b/project-lakitu/sys-kernel/lakitu-kernel-5_10/files/base.config-arm64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.67 Kernel Configuration
+# Linux/arm64 5.10.70 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="Chromium OS 12.0_pre422132_p20210405-r9 clang version 13.0.0 (/var/tmp/portage/sys-devel/llvm-12.0_pre422132_p20210405-r9/work/llvm-12.0_pre422132_p20210405/clang cd442157cff4aad209ae532cbf031abbe10bc1df)"
CONFIG_GCC_VERSION=0
@@ -991,8 +991,8 @@
CONFIG_SYN_COOKIES=y
# CONFIG_NET_IPVTI is not set
CONFIG_NET_UDP_TUNNEL=m
-# CONFIG_NET_FOU is not set
-# CONFIG_NET_FOU_IP_TUNNELS is not set
+CONFIG_NET_FOU=m
+CONFIG_NET_FOU_IP_TUNNELS=y
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
# CONFIG_INET_ESP_OFFLOAD is not set
@@ -1034,9 +1034,12 @@
# CONFIG_INET6_IPCOMP is not set
# CONFIG_IPV6_MIP6 is not set
# CONFIG_IPV6_ILA is not set
+CONFIG_INET6_TUNNEL=m
# CONFIG_IPV6_VTI is not set
# CONFIG_IPV6_SIT is not set
-# CONFIG_IPV6_TUNNEL is not set
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
CONFIG_IPV6_MULTIPLE_TABLES=y
# CONFIG_IPV6_SUBTREES is not set
# CONFIG_IPV6_MROUTE is not set
@@ -2595,7 +2598,6 @@
# DMABUF options
#
# CONFIG_SYNC_FILE is not set
-# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_HEAPS is not set
# end of DMABUF options
diff --git a/project-lakitu/sys-kernel/lakitu-kernel-5_10/files/base.config-x86_64 b/project-lakitu/sys-kernel/lakitu-kernel-5_10/files/base.config-x86_64
index 9f50c1b..7c5c51e 100644
--- a/project-lakitu/sys-kernel/lakitu-kernel-5_10/files/base.config-x86_64
+++ b/project-lakitu/sys-kernel/lakitu-kernel-5_10/files/base.config-x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.10.67 Kernel Configuration
+# Linux/x86_64 5.10.70 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="Chromium OS 12.0_pre422132_p20210405-r9 clang version 13.0.0 (/var/tmp/portage/sys-devel/llvm-12.0_pre422132_p20210405-r9/work/llvm-12.0_pre422132_p20210405/clang cd442157cff4aad209ae532cbf031abbe10bc1df)"
CONFIG_GCC_VERSION=0
@@ -985,8 +985,8 @@
CONFIG_SYN_COOKIES=y
# CONFIG_NET_IPVTI is not set
CONFIG_NET_UDP_TUNNEL=m
-# CONFIG_NET_FOU is not set
-# CONFIG_NET_FOU_IP_TUNNELS is not set
+CONFIG_NET_FOU=m
+CONFIG_NET_FOU_IP_TUNNELS=y
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
# CONFIG_INET_ESP_OFFLOAD is not set
@@ -1028,9 +1028,12 @@
# CONFIG_INET6_IPCOMP is not set
# CONFIG_IPV6_MIP6 is not set
# CONFIG_IPV6_ILA is not set
+CONFIG_INET6_TUNNEL=m
# CONFIG_IPV6_VTI is not set
# CONFIG_IPV6_SIT is not set
-# CONFIG_IPV6_TUNNEL is not set
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
CONFIG_IPV6_MULTIPLE_TABLES=y
# CONFIG_IPV6_SUBTREES is not set
# CONFIG_IPV6_MROUTE is not set
@@ -2599,7 +2602,6 @@
# DMABUF options
#
# CONFIG_SYNC_FILE is not set
-# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_HEAPS is not set
# end of DMABUF options
diff --git a/project-lakitu/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-9999.ebuild b/project-lakitu/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-9999.ebuild
index d494b53..dcc8f78 100644
--- a/project-lakitu/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-9999.ebuild
+++ b/project-lakitu/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-9999.ebuild
@@ -58,4 +58,4 @@
# NOTE: There's nothing magic keeping this number prime but you just need to
# make _any_ change to this file. ...so why not keep it prime?
#
-# The coolest prime number is: 31
+# The coolest prime number is: 37
