From 8543e397c2fd39a03d5fb0048644a436d2e1aa46 Mon Sep 17 00:00:00 2001 From: Jarek Poplawski Date: Mon, 22 Sep 2008 22:16:23 -0700 Subject: [PATCH] --- yaml --- r: 111787 b: refs/heads/master c: ebf059821ed8a36acd706484b719d14d212ada32 h: refs/heads/master i: 111785: e0d913b4334233262d39193a8a120c9de1558612 111783: 72a05446d1ac0e6189c316a5fbb0b0117e026c96 v: v3 --- [refs] | 2 +- trunk/net/sched/sch_generic.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8277df957822..2fffe9448eb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0876520b0b721bedafd9cec3b1b0624ae566eee +refs/heads/master: ebf059821ed8a36acd706484b719d14d212ada32 diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c index 1b508bd1c06c..5e7e0bd38fe8 100644 --- a/trunk/net/sched/sch_generic.c +++ b/trunk/net/sched/sch_generic.c @@ -52,11 +52,21 @@ static inline int dev_requeue_skb(struct sk_buff *skb, struct Qdisc *q) static inline struct sk_buff *dequeue_skb(struct Qdisc *q) { - struct sk_buff *skb; - - skb = __skb_dequeue(&q->requeue); - if (!skb) + struct sk_buff *skb = skb_peek(&q->requeue); + + if (unlikely(skb)) { + struct net_device *dev = qdisc_dev(q); + struct netdev_queue *txq; + + /* check the reason of requeuing without tx lock first */ + txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb)); + if (!netif_tx_queue_stopped(txq) && !netif_tx_queue_frozen(txq)) + __skb_unlink(skb, &q->requeue); + else + skb = NULL; + } else { skb = q->dequeue(q); + } return skb; }