Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-14 09:09:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net/sched/sch_hfsc.c: remove leftover dlist and droplist

Browse Source 
This is update to:
commit a09ceb0e08140a ("sched: remove qdisc->drop")

That commit removed qdisc->drop, but left alone dlist and droplist
that no longer serve any meaningful purpose.

Signed-off-by: Michal Soltys <soltys@ziu.info>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michal Soltys 2016-06-30 02:26:46 +02:00 committed by David S. Miller
parent d1d0fc5e4c
commit 2354f056f6
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/sched/sch_hfsc.c
View File

@ -130,7 +130,6 @@ struct hfsc_class {
struct rb_node vt_node; /* parent's vt_tree member */ struct rb_node vt_node; /* parent's vt_tree member */
struct rb_root cf_tree; /* active children sorted by cl_f */ struct rb_root cf_tree; /* active children sorted by cl_f */
struct rb_node cf_node; /* parent's cf_heap member */ struct rb_node cf_node; /* parent's cf_heap member */
struct list_head dlist; /* drop list member */
u64 cl_total; /* total work in bytes */ u64 cl_total; /* total work in bytes */
u64 cl_cumul; /* cumulative work in bytes done by u64 cl_cumul; /* cumulative work in bytes done by
@ -177,8 +176,6 @@ struct hfsc_sched {
struct hfsc_class root; /* root class */ struct hfsc_class root; /* root class */
struct Qdisc_class_hash clhash; /* class hash */ struct Qdisc_class_hash clhash; /* class hash */
struct rb_root eligible; /* eligible tree */ struct rb_root eligible; /* eligible tree */
struct list_head droplist; /* active leaf class list (for
dropping) */
struct qdisc_watchdog watchdog; /* watchdog timer */ struct qdisc_watchdog watchdog; /* watchdog timer */
}; };
@ -858,7 +855,6 @@ set_active(struct hfsc_class *cl, unsigned int len)
if (cl->cl_flags & HFSC_FSC) if (cl->cl_flags & HFSC_FSC)
init_vf(cl, len); init_vf(cl, len);
list_add_tail(&cl->dlist, &cl->sched->droplist);
} }
static void static void
@ -867,8 +863,6 @@ set_passive(struct hfsc_class *cl)
if (cl->cl_flags & HFSC_RSC) if (cl->cl_flags & HFSC_RSC)
eltree_remove(cl); eltree_remove(cl);
list_del(&cl->dlist);
/* /*
* vttree is now handled in update_vf() so that update_vf(cl, 0, 0) * vttree is now handled in update_vf() so that update_vf(cl, 0, 0)
* needs to be called explicitly to remove a class from vttree. * needs to be called explicitly to remove a class from vttree.
@ -1443,7 +1437,6 @@ hfsc_init_qdisc(struct Qdisc *sch, struct nlattr *opt)
if (err < 0) if (err < 0)
return err; return err;
q->eligible = RB_ROOT; q->eligible = RB_ROOT;
INIT_LIST_HEAD(&q->droplist);
q->root.cl_common.classid = sch->handle; q->root.cl_common.classid = sch->handle;
q->root.refcnt = 1; q->root.refcnt = 1;
@ -1527,7 +1520,6 @@ hfsc_reset_qdisc(struct Qdisc *sch)
hfsc_reset_class(cl); hfsc_reset_class(cl);
} }
q->eligible = RB_ROOT; q->eligible = RB_ROOT;
INIT_LIST_HEAD(&q->droplist);
qdisc_watchdog_cancel(&q->watchdog); qdisc_watchdog_cancel(&q->watchdog);
sch->qstats.backlog = 0; sch->qstats.backlog = 0;
sch->q.qlen = 0; sch->q.qlen = 0;