From aea99f20ac9c816fd582aaf0e5dea674e09bdd3e Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas.nussbaum@imag.fr>
Date: Thu, 30 Aug 2007 22:35:46 -0700
Subject: [PATCH] --- yaml --- r: 64608 b: refs/heads/master c:
 dbaaa07a60edf71670b484a65e14400ab40c84f7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0ad210ede4b1..0be6c8bea797 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4a488d1824a2cc3514f9ee1298d805bd5edc893
+refs/heads/master: dbaaa07a60edf71670b484a65e14400ab40c84f7
diff --git a/trunk/net/sched/sch_prio.c b/trunk/net/sched/sch_prio.c
index 4a49db65772e..abd82fc3ec60 100644
--- a/trunk/net/sched/sch_prio.c
+++ b/trunk/net/sched/sch_prio.c
@@ -44,7 +44,7 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
 	if (TC_H_MAJ(skb->priority) != sch->handle) {
 		err = tc_classify(skb, q->filter_list, &res);
 #ifdef CONFIG_NET_CLS_ACT
-		switch (tc_classify(skb, q->filter_list, &res)) {
+		switch (err) {
 		case TC_ACT_STOLEN:
 		case TC_ACT_QUEUED:
 			*qerr = NET_XMIT_SUCCESS;