aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/act_api.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sched/act_api.c')
-rw-r--r--net/sched/act_api.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 711dd26c95c3..72bb9bd1a22a 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -42,10 +42,8 @@ void tcf_hash_destroy(struct tcf_common *p, struct tcf_hashinfo *hinfo)
42 write_lock_bh(hinfo->lock); 42 write_lock_bh(hinfo->lock);
43 *p1p = p->tcfc_next; 43 *p1p = p->tcfc_next;
44 write_unlock_bh(hinfo->lock); 44 write_unlock_bh(hinfo->lock);
45#ifdef CONFIG_NET_ESTIMATOR
46 gen_kill_estimator(&p->tcfc_bstats, 45 gen_kill_estimator(&p->tcfc_bstats,
47 &p->tcfc_rate_est); 46 &p->tcfc_rate_est);
48#endif
49 kfree(p); 47 kfree(p);
50 return; 48 return;
51 } 49 }
@@ -236,11 +234,9 @@ struct tcf_common *tcf_hash_create(u32 index, struct rtattr *est, struct tc_acti
236 p->tcfc_index = index ? index : tcf_hash_new_index(idx_gen, hinfo); 234 p->tcfc_index = index ? index : tcf_hash_new_index(idx_gen, hinfo);
237 p->tcfc_tm.install = jiffies; 235 p->tcfc_tm.install = jiffies;
238 p->tcfc_tm.lastuse = jiffies; 236 p->tcfc_tm.lastuse = jiffies;
239#ifdef CONFIG_NET_ESTIMATOR
240 if (est) 237 if (est)
241 gen_new_estimator(&p->tcfc_bstats, &p->tcfc_rate_est, 238 gen_new_estimator(&p->tcfc_bstats, &p->tcfc_rate_est,
242 p->tcfc_stats_lock, est); 239 p->tcfc_stats_lock, est);
243#endif
244 a->priv = (void *) p; 240 a->priv = (void *) p;
245 return p; 241 return p;
246} 242}
@@ -614,9 +610,7 @@ int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *a,
614 goto errout; 610 goto errout;
615 611
616 if (gnet_stats_copy_basic(&d, &h->tcf_bstats) < 0 || 612 if (gnet_stats_copy_basic(&d, &h->tcf_bstats) < 0 ||
617#ifdef CONFIG_NET_ESTIMATOR
618 gnet_stats_copy_rate_est(&d, &h->tcf_rate_est) < 0 || 613 gnet_stats_copy_rate_est(&d, &h->tcf_rate_est) < 0 ||
619#endif
620 gnet_stats_copy_queue(&d, &h->tcf_qstats) < 0) 614 gnet_stats_copy_queue(&d, &h->tcf_qstats) < 0)
621 goto errout; 615 goto errout;
622 616