From 234e7586662f4a37a23cd0e60528d7c364f539a7 Mon Sep 17 00:00:00 2001
From: Omoeba <38597972+Omoeba@users.noreply.github.com>
Date: Fri, 3 Apr 2026 16:33:19 -0700
Subject: [PATCH] configs: enable NET_ACT_CTINFO in Raspberry Pi defconfigs

Enable NET_ACT_CTINFO as a module in the Raspberry Pi defconfigs.

This is useful for Raspberry Pi router/SQM deployments where upstream
DSCP markings are bleached or not preserved and users want to restore
classification state from conntrack metadata in tc.

Tested on Raspberry Pi 5 with Raspberry Pi OS Trixie:
- modprobe act_ctinfo succeeds
- tc accepts ctinfo action
- verified ingress DSCP restore in a CAKE-based setup

Signed-off-by: Omoeba <38597972+Omoeba@users.noreply.github.com>
---
 arch/arm/configs/bcm2709_defconfig      | 1 +
 arch/arm/configs/bcm2711_defconfig      | 1 +
 arch/arm/configs/bcmrpi_defconfig       | 1 +
 arch/arm64/configs/bcm2711_defconfig    | 1 +
 arch/arm64/configs/bcm2711_rt_defconfig | 1 +
 arch/arm64/configs/bcm2712_defconfig    | 1 +
 6 files changed, 6 insertions(+)

diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
index 614e3002770bf5..fdf662778a19cb 100644
--- a/arch/arm/configs/bcm2709_defconfig
+++ b/arch/arm/configs/bcm2709_defconfig
@@ -388,6 +388,7 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
 CONFIG_BATMAN_ADV=m
 CONFIG_OPENVSWITCH=m
 CONFIG_CGROUP_NET_PRIO=y
diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
index c5515d519c174a..517ca1920e1142 100644
--- a/arch/arm/configs/bcm2711_defconfig
+++ b/arch/arm/configs/bcm2711_defconfig
@@ -390,6 +390,7 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
 CONFIG_BATMAN_ADV=m
 CONFIG_OPENVSWITCH=m
 CONFIG_CGROUP_NET_PRIO=y
diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
index f11a6bc5b5acee..8ffb1baa7c7b61 100644
--- a/arch/arm/configs/bcmrpi_defconfig
+++ b/arch/arm/configs/bcmrpi_defconfig
@@ -382,6 +382,7 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
 CONFIG_BATMAN_ADV=m
 CONFIG_OPENVSWITCH=m
 CONFIG_CGROUP_NET_PRIO=y
diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
index ddbc08e8edc00e..9c5b856eb16b1f 100644
--- a/arch/arm64/configs/bcm2711_defconfig
+++ b/arch/arm64/configs/bcm2711_defconfig
@@ -412,6 +412,7 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
 CONFIG_BATMAN_ADV=m
 CONFIG_OPENVSWITCH=m
 CONFIG_VSOCKETS=m
diff --git a/arch/arm64/configs/bcm2711_rt_defconfig b/arch/arm64/configs/bcm2711_rt_defconfig
index cf78cbc6fc0292..e5790552b5714a 100644
--- a/arch/arm64/configs/bcm2711_rt_defconfig
+++ b/arch/arm64/configs/bcm2711_rt_defconfig
@@ -412,6 +412,7 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
 CONFIG_BATMAN_ADV=m
 CONFIG_OPENVSWITCH=m
 CONFIG_VSOCKETS=m
diff --git a/arch/arm64/configs/bcm2712_defconfig b/arch/arm64/configs/bcm2712_defconfig
index 1a3be779799979..a52e9855956478 100644
--- a/arch/arm64/configs/bcm2712_defconfig
+++ b/arch/arm64/configs/bcm2712_defconfig
@@ -415,6 +415,7 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
 CONFIG_BATMAN_ADV=m
 CONFIG_OPENVSWITCH=m
 CONFIG_VSOCKETS=m