git.openpandora.org
/
pandora-kernel.git
/ 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/torvalds/linux-2.6
[pandora-kernel.git]
/
net
/
sched
/
act_mirred.c
diff --git
a/net/sched/act_mirred.c
b/net/sched/act_mirred.c
index
70341c0
..
b9aaab4
100644
(file)
--- a/
net/sched/act_mirred.c
+++ b/
net/sched/act_mirred.c
@@
-105,8
+105,8
@@
static int tcf_mirred_init(struct nlattr *nla, struct nlattr *est,
return -EINVAL;
pc = tcf_hash_create(parm->index, est, a, sizeof(*m), bind,
&mirred_idx_gen, &mirred_hash_info);
- if (
unlikely(!
pc))
-
return -ENOMEM
;
+ if (
IS_ERR(
pc))
+
return PTR_ERR(pc)
;
ret = ACT_P_CREATED;
} else {
if (!ovr) {