Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...

[firefly-linux-kernel-4.4.55.git] / net / sched / sch_atm.c

diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
index c398f9c3dbdd8d2d60a467a4ec268b07984b0f46..e3e2cc5fd0689e6ac5b6226ab7ca0987601ad733 100644 (file)
--- a/net/sched/sch_atm.c
+++ b/net/sched/sch_atm.c
@@ -417,7 +417,7 @@ done:
        if (ret != NET_XMIT_SUCCESS) {
 drop: __maybe_unused
                if (net_xmit_drop_count(ret)) {
-                       sch->qstats.drops++;
+                       qdisc_qstats_drop(sch);
                        if (flow)
                                flow->qstats.drops++;
                }
@@ -637,10 +637,8 @@ atm_tc_dump_class_stats(struct Qdisc *sch, unsigned long arg,
 {
        struct atm_flow_data *flow = (struct atm_flow_data *)arg;
 
-       flow->qstats.qlen = flow->q->q.qlen;
-
-       if (gnet_stats_copy_basic(d, &flow->bstats) < 0 ||
-           gnet_stats_copy_queue(d, &flow->qstats) < 0)
+       if (gnet_stats_copy_basic(d, NULL, &flow->bstats) < 0 ||
+           gnet_stats_copy_queue(d, NULL, &flow->qstats, flow->q->q.qlen) < 0)
                return -1;
 
        return 0;