summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorVasily Averin <vvs@parallels.com>2014-08-14 12:27:59 +0400
committerDavid S. Miller <davem@davemloft.net>2014-08-19 10:58:44 -0700
commit7201c1ddf774c12daa2dd5da098b8929db53f047 (patch)
treea199e218bf0b0603bd71ebe7a74d14a4f54c7bbf /net
parent73d0f37ac4ee5b60e6b9c1b3ccb8766bade9d9c5 (diff)
downloadlinux-stable-7201c1ddf774c12daa2dd5da098b8929db53f047.tar.gz
linux-stable-7201c1ddf774c12daa2dd5da098b8929db53f047.tar.bz2
linux-stable-7201c1ddf774c12daa2dd5da098b8929db53f047.zip
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.c11
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 {
struct cbq_class *tx_borrowed;
int tx_len;
psched_time_t now; /* Cached timestamp */
- psched_time_t now_rt; /* Cached real time */
unsigned int pmask;
struct hrtimer delay_timer;
@@ -353,12 +352,7 @@ cbq_mark_toplevel(struct cbq_sched_data *q, struct cbq_class *cl)
int toplevel = q->toplevel;
if (toplevel > cl->level && !(qdisc_is_throttled(cl->q))) {
- psched_time_t now;
- psched_tdiff_t incr;
-
- now = psched_get_time();
- incr = now - q->now_rt;
- now = q->now + incr;
+ psched_time_t now = psched_get_time();
do {
if (cl->undertime < now) {
@@ -956,7 +950,6 @@ cbq_dequeue(struct Qdisc *sch)
cbq_update(q);
q->now = now;
- q->now_rt = now;
for (;;) {
q->wd_expires = 0;
@@ -1212,7 +1205,6 @@ cbq_reset(struct Qdisc *sch)
hrtimer_cancel(&q->delay_timer);
q->toplevel = TC_CBQ_MAXLEVEL;
q->now = psched_get_time();
- q->now_rt = q->now;
for (prio = 0; prio <= TC_CBQ_MAXPRIO; prio++)
q->active[prio] = NULL;
@@ -1396,7 +1388,6 @@ static int cbq_init(struct Qdisc *sch, struct nlattr *opt)
q->delay_timer.function = cbq_undelay;
q->toplevel = TC_CBQ_MAXLEVEL;
q->now = psched_get_time();
- q->now_rt = q->now;
cbq_link_class(&q->link);