X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Fnet%2Fsched%2Fsch_hfsc.c;fp=kernel%2Fnet%2Fsched%2Fsch_hfsc.c;h=d783d7cc33487f284677e107f5083588f559f742;hb=52f993b8e89487ec9ee15a7fb4979e0f09a45b27;hp=b7ebe2c87586416d615a13ce470bdfddf117a80d;hpb=c189ccac5702322ed843fe17057035b7222a59b6;p=kvmfornfv.git diff --git a/kernel/net/sched/sch_hfsc.c b/kernel/net/sched/sch_hfsc.c index b7ebe2c87..d783d7cc3 100644 --- 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; + unsigned int backlog = cl->qdisc->qstats.backlog; qdisc_reset(cl->qdisc); - qdisc_tree_decrease_qlen(cl->qdisc, len); + qdisc_tree_reduce_backlog(cl->qdisc, len, backlog); } static void @@ -1215,11 +1216,7 @@ hfsc_graft_class(struct Qdisc *sch, unsigned long arg, struct Qdisc *new, 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; }