From patchwork Sun Jan 29 21:43:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 721219 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vBQyL6PKcz9sCX for ; Mon, 30 Jan 2017 08:43:54 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=toke.dk header.i=@toke.dk header.b="RvZgHGbo"; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 4B20DB911DD; Sun, 29 Jan 2017 22:43:50 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Sun, 29 Jan 2017 22:43:50 +0100 (CET) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 77D98B90BC3 for ; Sun, 29 Jan 2017 22:43:48 +0100 (CET) X-policyd-weight: using cached result; rate: -6.1 Received: from mail.toke.dk (mail.toke.dk [52.28.52.200]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sun, 29 Jan 2017 22:43:47 +0100 (CET) Received: from mail.toke.dk (localhost.localdomain [127.0.0.1]) by mail.toke.dk (Postfix) with ESMTPS id CA8DA5CD86; Sun, 29 Jan 2017 22:43:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=toke.dk; s=20161023; t=1485726225; bh=1CcQ4bbJ+9kvy6piKxmPU93s9aBDABbtFAleby/5vuA=; h=From:To:Cc:Subject:Date:From; b=RvZgHGboZB1DbVGtoaFCYP2Cj+mvrKUq9t4RbOrQw2ZlxkLlUgxLtcwZG2hZArpuj B8+dCeN7547sX+fT/rh0EGtWjyG4h3pJbaQW/YMVXtsJpJxBe/gptqBnOgg653e1VQ okkdQWnw9G/LROFvYJi2P1frwBh2LDvIi0CmdgdJOi2Yy+pGetrOpe7Ael7qCNr/KH vM5cb2V4R9/dmY1FxRe8Jsn+AlM+beJbsgheivvPHhwkua4XxpM9HbSYbibImJe+BQ 3ayyGa/r7OJ62fj60mkr2AQIQGpd+OlMgOGRgkJXZ84fB6EtYCuHYp4Oc/iJXxAM1k m5tSUjmqQaXaA== Received: by alrua-kau.kau.toke.dk (Postfix, from userid 1000) id A2893C40D9F; Sun, 29 Jan 2017 22:43:44 +0100 (CET) From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= To: openwrt-devel@lists.openwrt.org Date: Sun, 29 Jan 2017 22:43:35 +0100 Message-Id: <20170129214335.3259-1-toke@toke.dk> MIME-Version: 1.0 Subject: [OpenWrt-Devel] [PATCH] kmod-sched-core: Add HTB and TBF traffic shapers X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" 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 --- package/kernel/linux/modules/netsupport.mk | 6 +++--- 1 file 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 \