summaryrefslogtreecommitdiff
path: root/net/sched
diff options
context:
space:
mode:
authorJarek Poplawski <jarkao2@gmail.com>2008-10-06 10:41:50 -0700
committerDavid S. Miller <davem@davemloft.net>2008-10-06 10:41:50 -0700
commit6252352d16f7b45a0fd42224f7e70e0288dc4480 (patch)
tree5740210fbe67fb754c47a13cf6d18d4e09a10015 /net/sched
parent554794de7949d1a6279336404c066f974d4c2bde (diff)
pkt_sched: Simplify dev_requeue_skb and dequeue_skb
qdisc->requeue was planned to universally replace all requeuing code, but at the top level we never requeue more than one skb, so qdisc-> gso_skb is enough for this. qdisc->requeue would be used on the lower levels only for one level deep requeuing (like in sch_hfsc) after finishing all the changes. Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/sch_generic.c21
1 files changed, 5 insertions, 16 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 3db4cf1bd26..31f6b614b59 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -44,12 +44,9 @@ 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))
- q->gso_skb = skb;
- else
- __skb_queue_head(&q->requeue, skb);
-
+ q->gso_skb = skb;
__netif_schedule(q);
+
return 0;
}
@@ -57,24 +54,16 @@ static inline struct sk_buff *dequeue_skb(struct Qdisc *q)
{
struct sk_buff *skb = q->gso_skb;
- if (!skb)
- 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)) {
- if (q->gso_skb)
- q->gso_skb = NULL;
- else
- __skb_unlink(skb, &q->requeue);
- } else {
+ if (!netif_tx_queue_stopped(txq) && !netif_tx_queue_frozen(txq))
+ q->gso_skb = NULL;
+ else
skb = NULL;
- }
} else {
skb = q->dequeue(q);
}