diff options
author | Vasily Averin <vvs@parallels.com> | 2014-08-14 04:27:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-19 13:58:44 -0400 |
commit | 7201c1ddf774c12daa2dd5da098b8929db53f047 (patch) | |
tree | a199e218bf0b0603bd71ebe7a74d14a4f54c7bbf /net | |
parent | 73d0f37ac4ee5b60e6b9c1b3ccb8766bade9d9c5 (diff) |
cbq: now_rt removal
Now q->now_rt is identical to q->now and is not required anymore.
Signed-off-by: Vasily Averin <vvs@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/sched/sch_cbq.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index 550be9504fff..762a04bb8f6d 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c | |||
@@ -159,7 +159,6 @@ struct cbq_sched_data { | |||
159 | struct cbq_class *tx_borrowed; | 159 | struct cbq_class *tx_borrowed; |
160 | int tx_len; | 160 | int tx_len; |
161 | psched_time_t now; /* Cached timestamp */ | 161 | psched_time_t now; /* Cached timestamp */ |
162 | psched_time_t now_rt; /* Cached real time */ | ||
163 | unsigned int pmask; | 162 | unsigned int pmask; |
164 | 163 | ||
165 | struct hrtimer delay_timer; | 164 | struct hrtimer delay_timer; |
@@ -353,12 +352,7 @@ cbq_mark_toplevel(struct cbq_sched_data *q, struct cbq_class *cl) | |||
353 | int toplevel = q->toplevel; | 352 | int toplevel = q->toplevel; |
354 | 353 | ||
355 | if (toplevel > cl->level && !(qdisc_is_throttled(cl->q))) { | 354 | if (toplevel > cl->level && !(qdisc_is_throttled(cl->q))) { |
356 | psched_time_t now; | 355 | psched_time_t now = psched_get_time(); |
357 | psched_tdiff_t incr; | ||
358 | |||
359 | now = psched_get_time(); | ||
360 | incr = now - q->now_rt; | ||
361 | now = q->now + incr; | ||
362 | 356 | ||
363 | do { | 357 | do { |
364 | if (cl->undertime < now) { | 358 | if (cl->undertime < now) { |
@@ -956,7 +950,6 @@ cbq_dequeue(struct Qdisc *sch) | |||
956 | cbq_update(q); | 950 | cbq_update(q); |
957 | 951 | ||
958 | q->now = now; | 952 | q->now = now; |
959 | q->now_rt = now; | ||
960 | 953 | ||
961 | for (;;) { | 954 | for (;;) { |
962 | q->wd_expires = 0; | 955 | q->wd_expires = 0; |
@@ -1212,7 +1205,6 @@ cbq_reset(struct Qdisc *sch) | |||
1212 | hrtimer_cancel(&q->delay_timer); | 1205 | hrtimer_cancel(&q->delay_timer); |
1213 | q->toplevel = TC_CBQ_MAXLEVEL; | 1206 | q->toplevel = TC_CBQ_MAXLEVEL; |
1214 | q->now = psched_get_time(); | 1207 | q->now = psched_get_time(); |
1215 | q->now_rt = q->now; | ||
1216 | 1208 | ||
1217 | for (prio = 0; prio <= TC_CBQ_MAXPRIO; prio++) | 1209 | for (prio = 0; prio <= TC_CBQ_MAXPRIO; prio++) |
1218 | q->active[prio] = NULL; | 1210 | q->active[prio] = NULL; |
@@ -1396,7 +1388,6 @@ static int cbq_init(struct Qdisc *sch, struct nlattr *opt) | |||
1396 | q->delay_timer.function = cbq_undelay; | 1388 | q->delay_timer.function = cbq_undelay; |
1397 | q->toplevel = TC_CBQ_MAXLEVEL; | 1389 | q->toplevel = TC_CBQ_MAXLEVEL; |
1398 | q->now = psched_get_time(); | 1390 | q->now = psched_get_time(); |
1399 | q->now_rt = q->now; | ||
1400 | 1391 | ||
1401 | cbq_link_class(&q->link); | 1392 | cbq_link_class(&q->link); |
1402 | 1393 | ||