From bec7bbf49e9f3238383749b98b3ed27c2b874e32 Mon Sep 17 00:00:00 2001
From: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Date: Sun, 17 Aug 2008 22:43:56 -0700
Subject: [PATCH] --- yaml --- r: 108816 b: refs/heads/master c:
 0d40b6e564bad2047b57a9afc48b701ef3243b89 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 8c47c340cb4e..ee678e812d8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e0d5a5747772182d1bb2525d8153da640fdfb58
+refs/heads/master: 0d40b6e564bad2047b57a9afc48b701ef3243b89
diff --git a/trunk/net/sched/sch_prio.c b/trunk/net/sched/sch_prio.c
index eac197610edf..7cdc3e6b31e6 100644
--- a/trunk/net/sched/sch_prio.c
+++ b/trunk/net/sched/sch_prio.c
@@ -117,7 +117,7 @@ prio_requeue(struct sk_buff *skb, struct Qdisc* sch)
 	}
 	if (net_xmit_drop_count(ret))
 		sch->qstats.drops++;
-	return NET_XMIT_DROP;
+	return ret;
 }