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 / act_api.c

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 648778aef1a254b9739443e93012798a134d0d86..3d43e4979f27c8dca3083c863549592216f741fe 100644 (file)
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -252,7 +252,8 @@ int tcf_hash_create(u32 index, struct nlattr *est, struct tc_action *a,
        p->tcfc_tm.install = jiffies;
        p->tcfc_tm.lastuse = jiffies;
        if (est) {
-               int err = gen_new_estimator(&p->tcfc_bstats, &p->tcfc_rate_est,
+               int err = gen_new_estimator(&p->tcfc_bstats, NULL,
+                                           &p->tcfc_rate_est,
                                            &p->tcfc_lock, est);
                if (err) {
                        kfree(p);
@@ -619,10 +620,12 @@ int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *a,
        if (err < 0)
                goto errout;
 
-       if (gnet_stats_copy_basic(&d, &p->tcfc_bstats) < 0 ||
+       if (gnet_stats_copy_basic(&d, NULL, &p->tcfc_bstats) < 0 ||
            gnet_stats_copy_rate_est(&d, &p->tcfc_bstats,
                                     &p->tcfc_rate_est) < 0 ||
-           gnet_stats_copy_queue(&d, &p->tcfc_qstats) < 0)
+           gnet_stats_copy_queue(&d, NULL,
+                                 &p->tcfc_qstats,
+                                 p->tcfc_qstats.qlen) < 0)
                goto errout;
 
        if (gnet_stats_finish_copy(&d) < 0)