@@ -369,6 +369,14 @@ enum net_xmit_qdisc_t {
#define net_xmit_drop_count(e) (1)
#endif
+static inline struct sk_buff *qdisc_dequeue(struct Qdisc *sch)
+{
+ struct sk_buff *skb = __skb_dequeue(&sch->requeue);
+ if (!skb)
+ skb = sch->dequeue(sch);
+ return skb;
+}
+
static inline int qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
{
#ifdef CONFIG_NET_SCHED
@@ -66,7 +66,7 @@ static inline struct sk_buff *dequeue_skb(struct Qdisc *q)
else
skb = NULL;
} else {
- skb = q->dequeue(q);
+ skb = qdisc_dequeue(q);
}
return skb;