From 140914617428e69de4bc9bf75d6067fa79b56f07 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 22 Sep 2008 22:15:58 -0700
Subject: [PATCH] --- yaml --- r: 111786 b: refs/heads/master c:
 f0876520b0b721bedafd9cec3b1b0624ae566eee h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8a49df98611f..8277df957822 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 242f8bfefe4bed626df4e4727ac8f315d80b567a
+refs/heads/master: f0876520b0b721bedafd9cec3b1b0624ae566eee
diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c
index 5961536be60c..1b508bd1c06c 100644
--- a/trunk/net/sched/sch_generic.c
+++ b/trunk/net/sched/sch_generic.c
@@ -44,10 +44,7 @@ static inline int qdisc_qlen(struct Qdisc *q)
 
 static inline int dev_requeue_skb(struct sk_buff *skb, struct Qdisc *q)
 {
-	if (unlikely(skb->next))
-		__skb_queue_head(&q->requeue, skb);
-	else
-		q->ops->requeue(skb, q);
+	__skb_queue_head(&q->requeue, skb);
 
 	__netif_schedule(q);
 	return 0;