From: Kevin Darbyshire-Bryant Date: Tue, 14 Apr 2020 07:48:33 +0000 (+0100) Subject: Revert "kmod-sched: add act_police" X-Git-Tag: v21.02.0-rc1~3072 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9fd36f54f53f2cd0f93116b3278b1d7f6219b6bb;p=openwrt%2Fopenwrt.git Revert "kmod-sched: add act_police" This reverts commit 1b973b54ea4d5d20dec5e71c48bff6a3e0bcb4ac. It turns out act_police is included in the kmod-sched package so this package turns out to be superfluous and causes file provision conflicts. Ooooops! Best revert it then. Signed-off-by: Kevin Darbyshire-Bryant --- diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 75222889c0..6dade49bad 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -867,16 +867,6 @@ define KernelPackage/sched-ctinfo endef $(eval $(call KernelPackage,sched-ctinfo)) -define KernelPackage/sched-police - SUBMENU:=$(NETWORK_SUPPORT_MENU) - TITLE:=Traffic shaper police support - DEPENDS:=+kmod-sched-core - KCONFIG:=CONFIG_NET_ACT_POLICE - FILES:=$(LINUX_DIR)/net/sched/act_police.ko - AUTOLOAD:=$(call AutoLoad,71, act_police) -endef -$(eval $(call KernelPackage,sched-police)) - define KernelPackage/sched-ipset SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Traffic shaper ipset support