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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[pandora-kernel.git]
/
net
/
sched
/
act_gact.c
diff --git
a/net/sched/act_gact.c
b/net/sched/act_gact.c
index
ac04289
..
e7f796a
100644
(file)
--- a/
net/sched/act_gact.c
+++ b/
net/sched/act_gact.c
@@
-88,8
+88,8
@@
static int tcf_gact_init(struct nlattr *nla, struct nlattr *est,
if (!pc) {
pc = tcf_hash_create(parm->index, est, a, sizeof(*gact),
bind, &gact_idx_gen, &gact_hash_info);
- if (
unlikely(!
pc))
-
return -ENOMEM
;
+ if (
IS_ERR(
pc))
+
return PTR_ERR(pc)
;
ret = ACT_P_CREATED;
} else {
if (!ovr) {