From e7e666ead501262dc9cbb18ef0c6ca466bd1f065 Mon Sep 17 00:00:00 2001
From: Thomas Graf <tgraf@suug.ch>
Date: Wed, 5 Jul 2006 20:47:28 -0700
Subject: [PATCH] --- yaml --- r: 32154 b: refs/heads/master c:
 4fe683f50d3fc8e36d4749277631dfc711393aa0 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/sched/act_api.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7aea456750ed..747348935b41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d152b4e1e9a18f332ecd9e66492d706edc083345
+refs/heads/master: 4fe683f50d3fc8e36d4749277631dfc711393aa0
diff --git a/trunk/net/sched/act_api.c b/trunk/net/sched/act_api.c
index 9b2e3975be0b..599423cc9d0d 100644
--- a/trunk/net/sched/act_api.c
+++ b/trunk/net/sched/act_api.c
@@ -250,15 +250,17 @@ tcf_action_dump(struct sk_buff *skb, struct tc_action *act, int bind, int ref)
 		RTA_PUT(skb, a->order, 0, NULL);
 		err = tcf_action_dump_1(skb, a, bind, ref);
 		if (err < 0)
-			goto rtattr_failure;
+			goto errout;
 		r->rta_len = skb->tail - (u8*)r;
 	}
 
 	return 0;
 
 rtattr_failure:
+	err = -EINVAL;
+errout:
 	skb_trim(skb, b - skb->data);
-	return -err;
+	return err;
 }
 
 struct tc_action *tcf_action_init_1(struct rtattr *rta, struct rtattr *est,