[PATCH 2/2] net/sched/sch_hfsc.c: comment out cl_myfadj
flat view
STALE3744d
SUPERSEDED
From: Michal Soltys <hidden>
Date: 2016-07-31 23:05:57
Subsystem:
networking [general], tc subsystem, the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Jamal Hadi Salim, Jiri Pirko, Linus Torvalds
Status: Superseded by v2 (posted 2016-08-02). [go to v2]
Revision v1 (3 revisions archived).
Revisions (3)
- rfc
- v1 current [diff against previous]
- v2 [diff against previous]
The part of the code using it is commented out, so the needless use
of this variable can be commented out as well.
Signed-off-by: Michal Soltys <redacted>
---
net/sched/sch_hfsc.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index 6329d7d..99ddc38 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c@@ -142,8 +142,11 @@ struct hfsc_class { link-sharing, max(myf, cfmin) */ u64 cl_myf; /* my fit-time (calculated from this class's own upperlimit curve) */ +#if 0 +/* code using cl_myfadj is disabled */ u64 cl_myfadj; /* my fit-time adjustment (to cancel history dependence) */ +#endif u64 cl_cfmin; /* earliest children's fit-time (used with cl_myf to obtain cl_f) */ u64 cl_cvtmin; /* minimal virtual time among the
@@ -730,7 +733,10 @@ init_vf(struct hfsc_class *cl, unsigned int len) /* compute myf */ cl->cl_myf = rtsc_y2x(&cl->cl_ulimit, cl->cl_total); +#if 0 +/* code using cl_myfadj is disabled */ cl->cl_myfadj = 0; +#endif } }
@@ -797,9 +803,10 @@ update_vf(struct hfsc_class *cl, unsigned int len, u64 cur_time) /* update f */ if (cl->cl_flags & HFSC_USC) { + cl->cl_myf = rtsc_y2x(&cl->cl_ulimit, cl->cl_total); +#if 0 cl->cl_myf = cl->cl_myfadj + rtsc_y2x(&cl->cl_ulimit, cl->cl_total); -#if 0 /* * This code causes classes to stay way under their * limit when multiple classes are used at gigabit
@@ -1471,7 +1478,10 @@ hfsc_reset_class(struct hfsc_class *cl) cl->cl_parentperiod = 0; cl->cl_f = 0; cl->cl_myf = 0; +#if 0 +/* code using cl_myfadj is disabled */ cl->cl_myfadj = 0; +#endif cl->cl_cfmin = 0; cl->cl_nactive = 0;
--
2.1.3