net: sched: make bstats per cpu and estimator RCU safe

[linux-2.6-block.git] / net / sched / act_api.c

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 648778aef1a254b9739443e93012798a134d0d86..eca4cf9ece2f12b2c2f6133375dd8012719ed60d 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,7 +620,7 @@ 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)