Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
net
/
sched
/
sch_drr.c
diff --git
a/kernel/net/sched/sch_drr.c
b/kernel/net/sched/sch_drr.c
index
f26bdea
..
d6e3ad4
100644
(file)
--- a/
kernel/net/sched/sch_drr.c
+++ b/
kernel/net/sched/sch_drr.c
@@
-53,9
+53,10
@@
static struct drr_class *drr_find_class(struct Qdisc *sch, u32 classid)
static void drr_purge_queue(struct drr_class *cl)
{
unsigned int len = cl->qdisc->q.qlen;
static void drr_purge_queue(struct drr_class *cl)
{
unsigned int len = cl->qdisc->q.qlen;
+ unsigned int backlog = cl->qdisc->qstats.backlog;
qdisc_reset(cl->qdisc);
qdisc_reset(cl->qdisc);
- qdisc_tree_
decrease_qlen(cl->qdisc, len
);
+ qdisc_tree_
reduce_backlog(cl->qdisc, len, backlog
);
}
static const struct nla_policy drr_policy[TCA_DRR_MAX + 1] = {
}
static const struct nla_policy drr_policy[TCA_DRR_MAX + 1] = {
@@
-226,11
+227,7
@@
static int drr_graft_class(struct Qdisc *sch, unsigned long arg,
new = &noop_qdisc;
}
new = &noop_qdisc;
}
- sch_tree_lock(sch);
- drr_purge_queue(cl);
- *old = cl->qdisc;
- cl->qdisc = new;
- sch_tree_unlock(sch);
+ *old = qdisc_replace(sch, new, &cl->qdisc);
return 0;
}
return 0;
}