Enable ip6table_mangle and ip6table_nat in 5.10
Enable configs CONFIG_IP6_NF_MANGLE and
CONFIG_IP6_NF_NAT as module in 5.10 for x86 and arm.
BUG=b/184087614
TEST=Presubmit and manually verify configs set in image
RELEASE_NOTE=Enable ip6table_mangle and ip6table_nat
Change-Id: I12ce947201b9922d19e4c7d3885de6b0aeb52940
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/15477
Reviewed-by: Roy Yang <royyang@google.com>
Reviewed-by: Oleksandr Tymoshenko <ovt@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 dc5834f..521db5f 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.19 Kernel Configuration
+# Linux/arm64 5.10.28 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="Chromium OS 12.0_pre408248_p20201125-r7 clang version 12.0.0 (/var/tmp/portage/sys-devel/llvm-12.0_pre408248_p20201125-r7/work/llvm-12.0_pre408248_p20201125/clang f402e682d0ef5598eeffc9a21a691b03e602ff58)"
CONFIG_GCC_VERSION=0
@@ -219,6 +219,7 @@
# CONFIG_BPF_PRELOAD is not set
# CONFIG_USERFAULTFD is not set
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
CONFIG_RSEQ=y
# CONFIG_DEBUG_RSEQ is not set
CONFIG_EMBEDDED=y
@@ -371,7 +372,6 @@
CONFIG_ARM64_VA_BITS=39
CONFIG_ARM64_PA_BITS_48=y
CONFIG_ARM64_PA_BITS=48
-# CONFIG_CPU_BIG_ENDIAN is not set
CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_SCHED_MC=y
CONFIG_SCHED_SMT=y
@@ -1292,15 +1292,19 @@
# CONFIG_IP6_NF_MATCH_HL is not set
# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
# CONFIG_IP6_NF_MATCH_MH is not set
+# CONFIG_IP6_NF_MATCH_RPFILTER is not set
# CONFIG_IP6_NF_MATCH_RT is not set
# CONFIG_IP6_NF_MATCH_SRH is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m
# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
-# CONFIG_IP6_NF_MANGLE is not set
+CONFIG_IP6_NF_MANGLE=m
# CONFIG_IP6_NF_RAW is not set
# CONFIG_IP6_NF_SECURITY is not set
-# CONFIG_IP6_NF_NAT is not set
+CONFIG_IP6_NF_NAT=m
+# CONFIG_IP6_NF_TARGET_MASQUERADE is not set
+# CONFIG_IP6_NF_TARGET_NPT is not set
# end of IPv6: Netfilter Configuration
CONFIG_NF_DEFRAG_IPV6=y
@@ -1518,7 +1522,6 @@
CONFIG_PCIE_PME=y
# CONFIG_PCIE_DPC is not set
# CONFIG_PCIE_PTM is not set
-# CONFIG_PCIE_BW is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_MSI_IRQ_DOMAIN=y
CONFIG_PCI_QUIRKS=y
@@ -2585,6 +2588,7 @@
# CONFIG_UIO_NETX is not set
# CONFIG_UIO_PRUSS is not set
# CONFIG_UIO_MF624 is not set
+# CONFIG_VFIO is not set
# CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO=y
CONFIG_VIRTIO_MENU=y
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 64c371c..74f6a1e 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.19 Kernel Configuration
+# Linux/x86_64 5.10.28 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="Chromium OS 12.0_pre408248_p20201125-r7 clang version 12.0.0 (/var/tmp/portage/sys-devel/llvm-12.0_pre408248_p20201125-r7/work/llvm-12.0_pre408248_p20201125/clang f402e682d0ef5598eeffc9a21a691b03e602ff58)"
CONFIG_GCC_VERSION=0
@@ -243,6 +243,7 @@
# CONFIG_BPF_PRELOAD is not set
# CONFIG_USERFAULTFD is not set
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
CONFIG_RSEQ=y
# CONFIG_DEBUG_RSEQ is not set
CONFIG_EMBEDDED=y
@@ -1295,15 +1296,19 @@
# CONFIG_IP6_NF_MATCH_HL is not set
# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
# CONFIG_IP6_NF_MATCH_MH is not set
+# CONFIG_IP6_NF_MATCH_RPFILTER is not set
# CONFIG_IP6_NF_MATCH_RT is not set
# CONFIG_IP6_NF_MATCH_SRH is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m
# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
-# CONFIG_IP6_NF_MANGLE is not set
+CONFIG_IP6_NF_MANGLE=m
# CONFIG_IP6_NF_RAW is not set
# CONFIG_IP6_NF_SECURITY is not set
-# CONFIG_IP6_NF_NAT is not set
+CONFIG_IP6_NF_NAT=m
+# CONFIG_IP6_NF_TARGET_MASQUERADE is not set
+# CONFIG_IP6_NF_TARGET_NPT is not set
# end of IPv6: Netfilter Configuration
CONFIG_NF_DEFRAG_IPV6=y
@@ -1520,7 +1525,6 @@
CONFIG_PCIE_PME=y
# CONFIG_PCIE_DPC is not set
# CONFIG_PCIE_PTM is not set
-# CONFIG_PCIE_BW is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_MSI_IRQ_DOMAIN=y
CONFIG_PCI_QUIRKS=y
@@ -2597,6 +2601,7 @@
# CONFIG_UIO_NETX is not set
# CONFIG_UIO_PRUSS is not set
# CONFIG_UIO_MF624 is not set
+# CONFIG_VFIO is not set
# CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO=y
CONFIG_VIRTIO_MENU=y
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 5655b71..820f95b 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: 3
+# The coolest prime number is: 5
