OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://1984.lsi.us.es/nf
[uclinux-h8/linux.git]
/
net
/
sched
/
act_simple.c
diff --git
a/net/sched/act_simple.c
b/net/sched/act_simple.c
index
3922f2a
..
3714f60
100644
(file)
--- a/
net/sched/act_simple.c
+++ b/
net/sched/act_simple.c
@@
-131,7
+131,10
@@
static int tcf_simp_init(struct nlattr *nla, struct nlattr *est,
d = to_defact(pc);
ret = alloc_defdata(d, defdata);
if (ret < 0) {
- kfree(pc);
+ if (est)
+ gen_kill_estimator(&pc->tcfc_bstats,
+ &pc->tcfc_rate_est);
+ kfree_rcu(pc, tcfc_rcu);
return ret;
}
d->tcf_action = parm->action;