3 files changed, 13 insertions, 20 deletions

diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h
index dcf5bfa7d4f1..d136b5240ef2 100644
--- a/include/net/gen_stats.h
+++ b/include/net/gen_stats.h
@@ -45,6 +45,6 @@ extern void gen_kill_estimator(struct gnet_stats_basic *bstats,
 extern int gen_replace_estimator(struct gnet_stats_basic *bstats,
                                  struct gnet_stats_rate_est *rate_est,
                                  spinlock_t *stats_lock, struct nlattr *opt);
-extern int gen_estimator_active(const struct gnet_stats_rate_est *rate_est);
-
+extern bool gen_estimator_active(const struct gnet_stats_basic *bstats,
+                                 const struct gnet_stats_rate_est *rate_est);
 #endif
diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c
index 3885550f0187..9cc9f95b109e 100644
--- a/net/core/gen_estimator.c
+++ b/net/core/gen_estimator.c
@@ -163,8 +163,9 @@ static void gen_add_node(struct gen_estimator *est)
         rb_insert_color(&est->node, &est_root);
 }
 
-static struct gen_estimator *gen_find_node(struct gnet_stats_basic *bstats,
-                                           struct gnet_stats_rate_est *rate_est)
+static
+struct gen_estimator *gen_find_node(const struct gnet_stats_basic *bstats,
+                                    const struct gnet_stats_rate_est *rate_est)
 {
         struct rb_node *p = est_root.rb_node;
 
@@ -301,26 +302,16 @@ EXPORT_SYMBOL(gen_replace_estimator);
 
 /**
  * gen_estimator_active - test if estimator is currently in use
+ * @bstats: basic statistics
  * @rate_est: rate estimator statistics
  *
- * Returns 1 if estimator is active, and 0 if not.
+ * Returns true if estimator is active, and false if not.
  */
-int gen_estimator_active(const struct gnet_stats_rate_est *rate_est)
+bool gen_estimator_active(const struct gnet_stats_basic *bstats,
+                          const struct gnet_stats_rate_est *rate_est)
 {
-        int idx;
-        struct gen_estimator *e;
-
         ASSERT_RTNL();
 
-        for (idx=0; idx <= EST_MAX_INTERVAL; idx++) {
-                if (!elist[idx].timer.function)
-                        continue;
-
-                list_for_each_entry(e, &elist[idx].list, list) {
-                        if (e->rate_est == rate_est)
-                                return 1;
-                }
-        }
-        return 0;
+        return gen_find_node(bstats, rate_est) != NULL;
 }
 EXPORT_SYMBOL(gen_estimator_active);
diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index c39f60cea6ee..5c72a116b1a4 100644
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -183,7 +183,9 @@ override:
                 if (R_tab == NULL)
                         goto failure;
 
-                if (!est && !gen_estimator_active(&police->tcf_rate_est)) {
+                if (!est && (ret == ACT_P_CREATED ||
+                             !gen_estimator_active(&police->tcf_bstats,
+                                                   &police->tcf_rate_est))) {
                         err = -EINVAL;
                         goto failure;
                 }