aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToke Høiland-Jørgensen <toke@toke.dk>2017-01-20 13:13:35 +0100
committerFelix Fietkau <nbd@nbd.name>2017-01-27 11:18:27 +0100
commitd45f81d7b13bcdc36864b2c5ec75ea88c234e088 (patch)
tree5d7849849403622b97c88bae07236142229892e5
parenta5eee54fd3691732885f0c80ecbf4530ff78d03f (diff)
downloadupstream-d45f81d7b13bcdc36864b2c5ec75ea88c234e088.tar.gz
upstream-d45f81d7b13bcdc36864b2c5ec75ea88c234e088.tar.bz2
upstream-d45f81d7b13bcdc36864b2c5ec75ea88c234e088.zip
kmod-sched-core: Add HTB and TBF traffic shapers
HTB and TBF are the basic traffic shapers used by sqm-scripts. Moving these into kmod-sched-core enables sqm-scripts to downgrade its dependency from kmod-sched to kmod-sched-core, potentially making it useful on devices with smaller flash sizes. This adds around 30k to the size of kmod-sched-core (20k for sch_htb.ko and 10k for sch_tbf.ko). Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
-rw-r--r--package/kernel/linux/modules/netsupport.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index ef5c5ba848..3d5e74327a 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -736,7 +736,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 cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_skbedit
+SCHED_MODULES_CORE = sch_ingress sch_fq_codel sch_hfsc sch_htb sch_tbf cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_skbedit
SCHED_MODULES_FILTER = $(SCHED_MODULES_CORE) act_connmark sch_netem
SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_FILTER),$(SCHED_MODULES))
SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(filter $(SCHED_MODULES_CORE),$(SCHED_MODULES)))
@@ -748,6 +748,8 @@ define KernelPackage/sched-core
KCONFIG:= \
CONFIG_NET_SCHED=y \
CONFIG_NET_SCH_HFSC \
+ CONFIG_NET_SCH_HTB \
+ CONFIG_NET_SCH_TBF \
CONFIG_NET_SCH_INGRESS \
CONFIG_NET_SCH_FQ_CODEL \
CONFIG_NET_CLS=y \
@@ -789,12 +791,10 @@ define KernelPackage/sched
KCONFIG:= \
CONFIG_NET_SCH_CODEL \
CONFIG_NET_SCH_DSMARK \
- CONFIG_NET_SCH_HTB \
CONFIG_NET_SCH_FIFO \
CONFIG_NET_SCH_GRED \
CONFIG_NET_SCH_PRIO \
CONFIG_NET_SCH_RED \
- CONFIG_NET_SCH_TBF \
CONFIG_NET_SCH_SFQ \
CONFIG_NET_SCH_TEQL \
CONFIG_NET_SCH_FQ \