ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-20 14:13:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

kernel: extract kmod-sched-act-ipt from kmod-sched

Browse Source 
There is only one module in kmod-sched that depends on iptables. Move it
to its own kmod package so we can drop the kmod-ipt-core dependency from
kmod-sched. This makes it possible to disable all kmod-ipt-* packages
without having to disable kmod-sched. Since we now default to firewall4
and nftables, we should avoid iptables dependencies where we can.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit 05775e38a5)
This commit is contained in:
Stijn Tintel 2022-07-21 18:26:56 +02:00 committed by Hauke Mehrtens
parent 23ccc71c61
commit 051c24c69a
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
package/kernel/linux/modules/netsupport.mk
View File

@ -807,6 +807,22 @@ endef
$(eval $(call KernelPackage,sched-act-sample)) $(eval $(call KernelPackage,sched-act-sample))
define KernelPackage/sched-act-ipt
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=IPtables targets
DEPENDS:=+kmod-ipt-core +kmod-sched-core
KCONFIG:=CONFIG_NET_ACT_IPT
FILES:=$(LINUX_DIR)/net/sched/act_ipt.ko
AUTOLOAD:=$(call AutoProbe, act_ipt)
endef
define KernelPackage/sched-act-ipt/description
Allows to invoke iptables targets after successful classification.
endef
$(eval $(call KernelPackage,sched-act-ipt))
define KernelPackage/sched-act-vlan define KernelPackage/sched-act-vlan
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Traffic VLAN manipulation TITLE:=Traffic VLAN manipulation
@ -980,13 +996,13 @@ endef
$(eval $(call KernelPackage,bpf-test)) $(eval $(call KernelPackage,bpf-test))
SCHED_MODULES_EXTRA = sch_codel sch_dsmark sch_gred sch_multiq sch_sfq sch_teql sch_fq sch_pie act_ipt act_pedit act_simple act_csum em_cmp em_nbyte em_meta em_text SCHED_MODULES_EXTRA = sch_codel sch_dsmark sch_gred sch_multiq sch_sfq sch_teql sch_fq sch_pie act_pedit act_simple act_csum em_cmp em_nbyte em_meta em_text
SCHED_FILES_EXTRA = $(foreach mod,$(SCHED_MODULES_EXTRA),$(LINUX_DIR)/net/sched/$(mod).ko) SCHED_FILES_EXTRA = $(foreach mod,$(SCHED_MODULES_EXTRA),$(LINUX_DIR)/net/sched/$(mod).ko)
define KernelPackage/sched define KernelPackage/sched
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Extra traffic schedulers TITLE:=Extra traffic schedulers
DEPENDS:=+kmod-sched-core +kmod-ipt-core +kmod-lib-crc32c +kmod-lib-textsearch DEPENDS:=+kmod-sched-core +kmod-lib-crc32c +kmod-lib-textsearch
KCONFIG:= \ KCONFIG:= \
CONFIG_NET_SCH_CODEL \ CONFIG_NET_SCH_CODEL \
CONFIG_NET_SCH_DSMARK \ CONFIG_NET_SCH_DSMARK \
@ -996,7 +1012,6 @@ define KernelPackage/sched
CONFIG_NET_SCH_TEQL \ CONFIG_NET_SCH_TEQL \
CONFIG_NET_SCH_FQ \ CONFIG_NET_SCH_FQ \
CONFIG_NET_SCH_PIE \ CONFIG_NET_SCH_PIE \
CONFIG_NET_ACT_IPT \
CONFIG_NET_ACT_PEDIT \ CONFIG_NET_ACT_PEDIT \
CONFIG_NET_ACT_SIMP \ CONFIG_NET_ACT_SIMP \
CONFIG_NET_ACT_CSUM \ CONFIG_NET_ACT_CSUM \