summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Soltys <soltys@ziu.info>2016-06-29 20:26:46 -0400
committerDavid S. Miller <davem@davemloft.net>2016-07-01 05:03:43 -0400
commit2354f056f6847125a95b42732ab481730389c099 (patch)
treed3d1a77e945cca16cb14f1d9eb7e76b701aa54bd
parentd1d0fc5e4c6822c5dadd9389297c7c1b8eea314f (diff)
net/sched/sch_hfsc.c: remove leftover dlist and droplist
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>
-rw-r--r--net/sched/sch_hfsc.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index e2244bb78130..df07f060c0e9 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -130,7 +130,6 @@ struct hfsc_class {
130 struct rb_node vt_node; /* parent's vt_tree member */ 130 struct rb_node vt_node; /* parent's vt_tree member */
131 struct rb_root cf_tree; /* active children sorted by cl_f */ 131 struct rb_root cf_tree; /* active children sorted by cl_f */
132 struct rb_node cf_node; /* parent's cf_heap member */ 132 struct rb_node cf_node; /* parent's cf_heap member */
133 struct list_head dlist; /* drop list member */
134 133
135 u64 cl_total; /* total work in bytes */ 134 u64 cl_total; /* total work in bytes */
136 u64 cl_cumul; /* cumulative work in bytes done by 135 u64 cl_cumul; /* cumulative work in bytes done by
@@ -177,8 +176,6 @@ struct hfsc_sched {
177 struct hfsc_class root; /* root class */ 176 struct hfsc_class root; /* root class */
178 struct Qdisc_class_hash clhash; /* class hash */ 177 struct Qdisc_class_hash clhash; /* class hash */
179 struct rb_root eligible; /* eligible tree */ 178 struct rb_root eligible; /* eligible tree */
180 struct list_head droplist; /* active leaf class list (for
181 dropping) */
182 struct qdisc_watchdog watchdog; /* watchdog timer */ 179 struct qdisc_watchdog watchdog; /* watchdog timer */
183}; 180};
184 181
@@ -858,7 +855,6 @@ set_active(struct hfsc_class *cl, unsigned int len)
858 if (cl->cl_flags & HFSC_FSC) 855 if (cl->cl_flags & HFSC_FSC)
859 init_vf(cl, len); 856 init_vf(cl, len);
860 857
861 list_add_tail(&cl->dlist, &cl->sched->droplist);
862} 858}
863 859
864static void 860static void
@@ -867,8 +863,6 @@ set_passive(struct hfsc_class *cl)
867 if (cl->cl_flags & HFSC_RSC) 863 if (cl->cl_flags & HFSC_RSC)
868 eltree_remove(cl); 864 eltree_remove(cl);
869 865
870 list_del(&cl->dlist);
871
872 /* 866 /*
873 * vttree is now handled in update_vf() so that update_vf(cl, 0, 0) 867 * vttree is now handled in update_vf() so that update_vf(cl, 0, 0)
874 * needs to be called explicitly to remove a class from vttree. 868 * needs to be called explicitly to remove a class from vttree.
@@ -1443,7 +1437,6 @@ hfsc_init_qdisc(struct Qdisc *sch, struct nlattr *opt)
1443 if (err < 0) 1437 if (err < 0)
1444 return err; 1438 return err;
1445 q->eligible = RB_ROOT; 1439 q->eligible = RB_ROOT;
1446 INIT_LIST_HEAD(&q->droplist);
1447 1440
1448 q->root.cl_common.classid = sch->handle; 1441 q->root.cl_common.classid = sch->handle;
1449 q->root.refcnt = 1; 1442 q->root.refcnt = 1;
@@ -1527,7 +1520,6 @@ hfsc_reset_qdisc(struct Qdisc *sch)
1527 hfsc_reset_class(cl); 1520 hfsc_reset_class(cl);
1528 } 1521 }
1529 q->eligible = RB_ROOT; 1522 q->eligible = RB_ROOT;
1530 INIT_LIST_HEAD(&q->droplist);
1531 qdisc_watchdog_cancel(&q->watchdog); 1523 qdisc_watchdog_cancel(&q->watchdog);
1532 sch->qstats.backlog = 0; 1524 sch->qstats.backlog = 0;
1533 sch->q.qlen = 0; 1525 sch->q.qlen = 0;