git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
net
/
sched
/
act_simple.c
diff --git
a/net/sched/act_simple.c
b/net/sched/act_simple.c
index
e7851ce
..
8daa1eb
100644
(file)
--- a/
net/sched/act_simple.c
+++ b/
net/sched/act_simple.c
@@
-124,8
+124,8
@@
static int tcf_simp_init(struct nlattr *nla, struct nlattr *est,
if (!pc) {
pc = tcf_hash_create(parm->index, est, a, sizeof(*d), bind,
&simp_idx_gen, &simp_hash_info);
- if (
unlikely(!
pc))
-
return -ENOMEM
;
+ if (
IS_ERR(
pc))
+
return PTR_ERR(pc)
;
d = to_defact(pc);
ret = alloc_defdata(d, defdata);