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_hfsc.c
diff --git
a/kernel/net/sched/sch_hfsc.c
b/kernel/net/sched/sch_hfsc.c
index
b7ebe2c
..
d783d7c
100644
(file)
--- a/
kernel/net/sched/sch_hfsc.c
+++ b/
kernel/net/sched/sch_hfsc.c
@@
-895,9
+895,10
@@
static void
hfsc_purge_queue(struct Qdisc *sch, struct hfsc_class *cl)
{
unsigned int len = cl->qdisc->q.qlen;
hfsc_purge_queue(struct Qdisc *sch, struct hfsc_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 void
}
static void
@@
-1215,11
+1216,7
@@
hfsc_graft_class(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
new = &noop_qdisc;
}
new = &noop_qdisc;
}
- sch_tree_lock(sch);
- hfsc_purge_queue(sch, cl);
- *old = cl->qdisc;
- cl->qdisc = new;
- sch_tree_unlock(sch);
+ *old = qdisc_replace(sch, new, &cl->qdisc);
return 0;
}
return 0;
}