diff mbox

net/sched/hfsc: allocate tcf block for hfsc root class

Message ID 150235750037.493227.16245118631720190134.stgit@buzz
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Konstantin Khlebnikov Aug. 10, 2017, 9:31 a.m. UTC
Without this filters cannot be attached.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Fixes: 6529eaba33f0 ("net: sched: introduce tcf block infractructure")
---
 net/sched/sch_hfsc.c |    8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Cong Wang Aug. 11, 2017, 8:29 p.m. UTC | #1
On Thu, Aug 10, 2017 at 2:31 AM, Konstantin Khlebnikov
<khlebnikov@yandex-team.ru> wrote:
> Without this filters cannot be attached.
>
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
> Fixes: 6529eaba33f0 ("net: sched: introduce tcf block infractructure")

Looks good.

Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
David Miller Aug. 11, 2017, 9:31 p.m. UTC | #2
From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Date: Thu, 10 Aug 2017 12:31:40 +0300

> Without this filters cannot be attached.
> 
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
> Fixes: 6529eaba33f0 ("net: sched: introduce tcf block infractructure")

Applied, thanks.
diff mbox

Patch

diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index b52f74610dc7..3ad02bbe6903 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -1428,6 +1428,10 @@  hfsc_init_qdisc(struct Qdisc *sch, struct nlattr *opt)
 		return err;
 	q->eligible = RB_ROOT;
 
+	err = tcf_block_get(&q->root.block, &q->root.filter_list);
+	if (err)
+		goto err_tcf;
+
 	q->root.cl_common.classid = sch->handle;
 	q->root.refcnt  = 1;
 	q->root.sched   = q;
@@ -1447,6 +1451,10 @@  hfsc_init_qdisc(struct Qdisc *sch, struct nlattr *opt)
 	qdisc_watchdog_init(&q->watchdog, sch);
 
 	return 0;
+
+err_tcf:
+	qdisc_class_hash_destroy(&q->clhash);
+	return err;
 }
 
 static int