From 809aa1a627f7e25d8cd949a08d9311f52a2dca03 Mon Sep 17 00:00:00 2001
From: Bryant Mairs <bryant@mai.rs>
Date: Mon, 30 Oct 2023 18:42:19 +0100
Subject: [PATCH] linux-postmarketos-qcom-msm8226: Enable nftables support (MR
 4528)

---
 .../linux-postmarketos-qcom-msm8226/APKBUILD  |  4 +-
 .../config-postmarketos-qcom-msm8226.armv7    | 54 ++++++++++++++++++-
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/device/testing/linux-postmarketos-qcom-msm8226/APKBUILD b/device/testing/linux-postmarketos-qcom-msm8226/APKBUILD
index 0cc921eeb..032c95ba4 100644
--- a/device/testing/linux-postmarketos-qcom-msm8226/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-msm8226/APKBUILD
@@ -4,7 +4,7 @@
 _flavor="postmarketos-qcom-msm8226"
 pkgname=linux-$_flavor
 pkgver=6.5.7
-pkgrel=2
+pkgrel=3
 _tag="v$pkgver-msm8226"
 pkgdesc="Mainline kernel fork for Qualcomm APQ8026/MSM8226/MSM8926 devices"
 arch="armv7"
@@ -60,5 +60,5 @@ package() {
 
 sha512sums="
 f7868e00a734fc5e85d0388e9a1c8faa798ebf35a345f5cd287c0bb8044e9b9fd9dfda57ac50e4e9113f18e251ffefe70bbe8f50828860b80f6fd2290063d9af  linux-v6.5.7-msm8226.tar.gz
-f86825d97548ecf9837d8f554e290a4ff315c134e547e5756d9c0b93eee1516d63d1554879b29f85fb37cc1489bb67233aa439e2cbe65321c168325e76d839a2  config-postmarketos-qcom-msm8226.armv7
+ff0bf9336648d5146172b016faf812c1deefbd9225ddc2ccb60c779c7a449e104fd1bd9203f329f1d263f9ed72ebd0a105ecc309dae12e8ed1b97136860f1691  config-postmarketos-qcom-msm8226.armv7
 "
diff --git a/device/testing/linux-postmarketos-qcom-msm8226/config-postmarketos-qcom-msm8226.armv7 b/device/testing/linux-postmarketos-qcom-msm8226/config-postmarketos-qcom-msm8226.armv7
index 70c658058..ee903419e 100644
--- a/device/testing/linux-postmarketos-qcom-msm8226/config-postmarketos-qcom-msm8226.armv7
+++ b/device/testing/linux-postmarketos-qcom-msm8226/config-postmarketos-qcom-msm8226.armv7
@@ -828,6 +828,8 @@ CONFIG_LOCK_MM_AND_FIND_VMA=y
 # end of Memory Management options
 
 CONFIG_NET=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
 
 #
 # Networking options
@@ -876,7 +878,55 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NET_PTP_CLASSIFY=y
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETFILTER is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_EGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+# CONFIG_NETFILTER_NETLINK_HOOK is not set
+# CONFIG_NETFILTER_NETLINK_ACCT is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NETFILTER_NETLINK_OSF is not set
+# CONFIG_NF_CONNTRACK is not set
+# CONFIG_NF_LOG_SYSLOG is not set
+CONFIG_NF_TABLES=m
+# CONFIG_NF_TABLES_NETDEV is not set
+# CONFIG_NFT_NUMGEN is not set
+# CONFIG_NFT_LOG is not set
+# CONFIG_NFT_LIMIT is not set
+# CONFIG_NFT_TUNNEL is not set
+# CONFIG_NFT_QUOTA is not set
+# CONFIG_NFT_REJECT is not set
+# CONFIG_NFT_HASH is not set
+# CONFIG_NFT_SOCKET is not set
+# CONFIG_NFT_OSF is not set
+# CONFIG_NFT_TPROXY is not set
+# CONFIG_NETFILTER_XTABLES is not set
+# end of Core Netfilter Configuration
+
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_NF_SOCKET_IPV4 is not set
+# CONFIG_NF_TPROXY_IPV4 is not set
+# CONFIG_NF_TABLES_IPV4 is not set
+# CONFIG_NF_TABLES_ARP is not set
+# CONFIG_NF_DUP_IPV4 is not set
+# CONFIG_NF_LOG_ARP is not set
+# CONFIG_NF_LOG_IPV4 is not set
+# CONFIG_NF_REJECT_IPV4 is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# end of IP: Netfilter Configuration
+
 # CONFIG_BPFILTER is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
@@ -6857,7 +6907,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC64 is not set
 # CONFIG_CRC4 is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
+CONFIG_LIBCRC32C=m
 CONFIG_CRC8=y
 CONFIG_XXHASH=y
 # CONFIG_RANDOM32_SELFTEST is not set