aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_sfq.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-10-31 03:44:18 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-31 03:44:18 -0400
commit48a8f519e0fe22a5c98523286b2a120841a11dd5 (patch)
treeec70428b026091669bf1e23779f9cfdd1a1ca46f /net/sched/sch_sfq.c
parent90d841fd0a5e02affd4e2bbdde4f710c61599281 (diff)
pkt_sched: Add ->peek() methods for fifo, prio and SFQ qdiscs.
From: Patrick McHardy <kaber@trash.net> Just as a demonstration how easy adding a peek operation to the work-conserving qdiscs actually is. It doesn't need to keep or change any internal state in many cases thanks to the guarantee that the packet will either be dequeued or, if another packet arrives, the upper qdisc will immediately ->peek again to reevaluate the state. (This is only slightly modified Patrick's patch.) Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_sfq.c')
-rw-r--r--net/sched/sch_sfq.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index fe1508ef0d3d..198b83d42ba8 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -391,8 +391,19 @@ sfq_requeue(struct sk_buff *skb, struct Qdisc *sch)
391 return NET_XMIT_CN; 391 return NET_XMIT_CN;
392} 392}
393 393
394static struct sk_buff *
395sfq_peek(struct Qdisc *sch)
396{
397 struct sfq_sched_data *q = qdisc_priv(sch);
398 sfq_index a;
394 399
400 /* No active slots */
401 if (q->tail == SFQ_DEPTH)
402 return NULL;
395 403
404 a = q->next[q->tail];
405 return skb_peek(&q->qs[a]);
406}
396 407
397static struct sk_buff * 408static struct sk_buff *
398sfq_dequeue(struct Qdisc *sch) 409sfq_dequeue(struct Qdisc *sch)
@@ -624,6 +635,7 @@ static struct Qdisc_ops sfq_qdisc_ops __read_mostly = {
624 .priv_size = sizeof(struct sfq_sched_data), 635 .priv_size = sizeof(struct sfq_sched_data),
625 .enqueue = sfq_enqueue, 636 .enqueue = sfq_enqueue,
626 .dequeue = sfq_dequeue, 637 .dequeue = sfq_dequeue,
638 .peek = sfq_peek,
627 .requeue = sfq_requeue, 639 .requeue = sfq_requeue,
628 .drop = sfq_drop, 640 .drop = sfq_drop,
629 .init = sfq_init, 641 .init = sfq_init,