diff options
author | Jamal Hadi Salim <hadi@cyberus.ca> | 2008-08-13 05:41:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-13 05:41:45 -0400 |
commit | 36723873b664fb6b5cfe06d291df948126e43f50 (patch) | |
tree | fa4fdae50b25ff2ce8dd57cc9cb59ede897d4017 | |
parent | f97017cdefefdb6a0e19266024b0c6f9fd411eeb (diff) |
net-sched: fix Action flushing return code
Flushing must consistently return ENOMEM on failure of any allocation
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/sched/act_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 88b57331d130..9974b3f04f05 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c | |||
@@ -751,7 +751,7 @@ static int tca_action_flush(struct nlattr *nla, struct nlmsghdr *n, u32 pid) | |||
751 | struct nlattr *tb[TCA_ACT_MAX+1]; | 751 | struct nlattr *tb[TCA_ACT_MAX+1]; |
752 | struct nlattr *kind; | 752 | struct nlattr *kind; |
753 | struct tc_action *a = create_a(0); | 753 | struct tc_action *a = create_a(0); |
754 | int err = -EINVAL; | 754 | int err = -ENOMEM; |
755 | 755 | ||
756 | if (a == NULL) { | 756 | if (a == NULL) { |
757 | printk("tca_action_flush: couldnt create tc_action\n"); | 757 | 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) | |||
762 | if (!skb) { | 762 | if (!skb) { |
763 | printk("tca_action_flush: failed skb alloc\n"); | 763 | printk("tca_action_flush: failed skb alloc\n"); |
764 | kfree(a); | 764 | kfree(a); |
765 | return -ENOBUFS; | 765 | return err; |
766 | } | 766 | } |
767 | 767 | ||
768 | b = skb_tail_pointer(skb); | 768 | b = skb_tail_pointer(skb); |