kernel/modules: move act_gact into kmod-sched-core
authorDENG Qingfang <dqfext@gmail.com>
Fri, 9 Apr 2021 04:25:08 +0000 (12:25 +0800)
committerFelix Fietkau <nbd@nbd.name>
Fri, 2 Jul 2021 11:31:11 +0000 (13:31 +0200)
As the name suggests, act_gact has the generic actions such as dropping
and accepting packets, so move it into kmod-sched-core.

Signed-off-by: DENG Qingfang <dqfext@gmail.com>
(cherry-picked from commit 10aacb9a6ce3445cdee39573f4120e7888beb022)

package/kernel/linux/modules/netsupport.mk

index f14928e18e65930c03dcf71d94fee72d7980fb9e..1eec9f9b639770750002a8510bd1df86c598cc52 100644 (file)
@@ -721,7 +721,7 @@ $(eval $(call KernelPackage,mppe))
 
 
 SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko))
-SCHED_MODULES_CORE = sch_ingress sch_fq_codel sch_hfsc sch_htb sch_tbf cls_basic cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_skbedit cls_matchall
+SCHED_MODULES_CORE = sch_ingress sch_fq_codel sch_hfsc sch_htb sch_tbf cls_basic cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_gact act_mirred act_skbedit cls_matchall
 SCHED_MODULES_FILTER = $(SCHED_MODULES_CORE) act_connmark act_ctinfo sch_cake sch_netem sch_mqprio em_ipset cls_bpf cls_flower act_bpf act_vlan
 SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_FILTER),$(SCHED_MODULES))
 SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(filter $(SCHED_MODULES_CORE),$(SCHED_MODULES)))
@@ -745,6 +745,7 @@ define KernelPackage/sched-core
        CONFIG_NET_CLS_ROUTE4 \
        CONFIG_NET_CLS_TCINDEX \
        CONFIG_NET_CLS_U32 \
+       CONFIG_NET_ACT_GACT \
        CONFIG_NET_ACT_MIRRED \
        CONFIG_NET_ACT_SKBEDIT \
        CONFIG_NET_CLS_MATCHALL \
@@ -899,7 +900,6 @@ define KernelPackage/sched
        CONFIG_NET_SCH_FQ \
        CONFIG_NET_SCH_PIE \
        CONFIG_NET_ACT_POLICE \
-       CONFIG_NET_ACT_GACT \
        CONFIG_NET_ACT_IPT \
        CONFIG_NET_ACT_PEDIT \
        CONFIG_NET_ACT_SIMP \