diff options
Diffstat (limited to 'net/sched/act_police.c')
-rw-r--r-- | net/sched/act_police.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sched/act_police.c b/net/sched/act_police.c index 0566e4606a4a..69791ca77a05 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c | |||
@@ -178,7 +178,7 @@ override: | |||
178 | 178 | ||
179 | spin_lock_bh(&police->tcf_lock); | 179 | spin_lock_bh(&police->tcf_lock); |
180 | if (est) { | 180 | if (est) { |
181 | err = gen_replace_estimator(&police->tcf_bstats, | 181 | err = gen_replace_estimator(&police->tcf_bstats, NULL, |
182 | &police->tcf_rate_est, | 182 | &police->tcf_rate_est, |
183 | &police->tcf_lock, est); | 183 | &police->tcf_lock, est); |
184 | if (err) | 184 | if (err) |
@@ -231,7 +231,7 @@ override: | |||
231 | if (ret != ACT_P_CREATED) | 231 | if (ret != ACT_P_CREATED) |
232 | return ret; | 232 | return ret; |
233 | 233 | ||
234 | police->tcfp_t_c = ktime_to_ns(ktime_get()); | 234 | police->tcfp_t_c = ktime_get_ns(); |
235 | police->tcf_index = parm->index ? parm->index : | 235 | police->tcf_index = parm->index ? parm->index : |
236 | tcf_hash_new_index(hinfo); | 236 | tcf_hash_new_index(hinfo); |
237 | h = tcf_hash(police->tcf_index, POL_TAB_MASK); | 237 | h = tcf_hash(police->tcf_index, POL_TAB_MASK); |
@@ -279,7 +279,7 @@ static int tcf_act_police(struct sk_buff *skb, const struct tc_action *a, | |||
279 | return police->tcfp_result; | 279 | return police->tcfp_result; |
280 | } | 280 | } |
281 | 281 | ||
282 | now = ktime_to_ns(ktime_get()); | 282 | now = ktime_get_ns(); |
283 | toks = min_t(s64, now - police->tcfp_t_c, | 283 | toks = min_t(s64, now - police->tcfp_t_c, |
284 | police->tcfp_burst); | 284 | police->tcfp_burst); |
285 | if (police->peak_present) { | 285 | if (police->peak_present) { |