diff options
| author | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-04-08 10:27:17 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-04-08 10:27:17 +0200 |
| commit | b85d00bfef2a62180d9ae74ecc95befe37686836 (patch) | |
| tree | 8d4347eac61358e8c7f6e1f40ad5677e5321eb97 /net/sched/sch_red.c | |
| parent | drm/sun4i: DW HDMI: Lower max. supported rate for H6 (diff) | |
| parent | drm/udl: add a release method and delay modeset teardown (diff) | |
| download | linux-b85d00bfef2a62180d9ae74ecc95befe37686836.tar.xz linux-b85d00bfef2a62180d9ae74ecc95befe37686836.zip | |
Merge drm/drm-fixes into drm-misc-fixes
We haven't backmerged for a while and this creates some coherency issues
across DRM drivers.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'net/sched/sch_red.c')
| -rw-r--r-- | net/sched/sch_red.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c index 9df9942340ea..4e8c0abf6194 100644 --- a/net/sched/sch_red.c +++ b/net/sched/sch_red.c @@ -233,8 +233,7 @@ static int red_change(struct Qdisc *sch, struct nlattr *opt, q->flags = ctl->flags; q->limit = ctl->limit; if (child) { - qdisc_tree_reduce_backlog(q->qdisc, q->qdisc->q.qlen, - q->qdisc->qstats.backlog); + qdisc_tree_flush_backlog(q->qdisc); old_child = q->qdisc; q->qdisc = child; } |