From 3730687f96a9960a274bfdc07335122416fce7bd Mon Sep 17 00:00:00 2001 From: Jamal Hadi Salim Date: Wed, 13 Aug 2008 02:41:45 -0700 Subject: [PATCH] --- yaml --- r: 108380 b: refs/heads/master c: 36723873b664fb6b5cfe06d291df948126e43f50 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sched/act_api.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 797965adc3a0..c25693b0b6df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f97017cdefefdb6a0e19266024b0c6f9fd411eeb +refs/heads/master: 36723873b664fb6b5cfe06d291df948126e43f50 diff --git a/trunk/net/sched/act_api.c b/trunk/net/sched/act_api.c index 88b57331d130..9974b3f04f05 100644 --- a/trunk/net/sched/act_api.c +++ b/trunk/net/sched/act_api.c @@ -751,7 +751,7 @@ static int tca_action_flush(struct nlattr *nla, struct nlmsghdr *n, u32 pid) struct nlattr *tb[TCA_ACT_MAX+1]; struct nlattr *kind; struct tc_action *a = create_a(0); - int err = -EINVAL; + int err = -ENOMEM; if (a == NULL) { printk("tca_action_flush: couldnt create tc_action\n"); @@ -762,7 +762,7 @@ static int tca_action_flush(struct nlattr *nla, struct nlmsghdr *n, u32 pid) if (!skb) { printk("tca_action_flush: failed skb alloc\n"); kfree(a); - return -ENOBUFS; + return err; } b = skb_tail_pointer(skb);