projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
net
/
sched
/
act_police.c
diff --git
a/net/sched/act_police.c
b/net/sched/act_police.c
index
f32bcb0
..
69791ca
100644
(file)
--- a/
net/sched/act_police.c
+++ b/
net/sched/act_police.c
@@
-178,7
+178,7
@@
override:
spin_lock_bh(&police->tcf_lock);
if (est) {
- err = gen_replace_estimator(&police->tcf_bstats,
+ err = gen_replace_estimator(&police->tcf_bstats,
NULL,
&police->tcf_rate_est,
&police->tcf_lock, est);
if (err)