3 files changed, 28 insertions, 0 deletions

diff --git a/net/sched/sch_fifo.c b/net/sched/sch_fifo.c
index 23d258bfe8ac..8825e8806f41 100644
--- a/net/sched/sch_fifo.c
+++ b/net/sched/sch_fifo.c
@@ -83,6 +83,7 @@ struct Qdisc_ops pfifo_qdisc_ops __read_mostly = {
         .priv_size      =       sizeof(struct fifo_sched_data),
         .enqueue        =       pfifo_enqueue,
         .dequeue        =       qdisc_dequeue_head,
+        .peek           =       qdisc_peek_head,
         .requeue        =       qdisc_requeue,
         .drop           =       qdisc_queue_drop,
         .init           =       fifo_init,
@@ -98,6 +99,7 @@ struct Qdisc_ops bfifo_qdisc_ops __read_mostly = {
         .priv_size      =       sizeof(struct fifo_sched_data),
         .enqueue        =       bfifo_enqueue,
         .dequeue        =       qdisc_dequeue_head,
+        .peek           =       qdisc_peek_head,
         .requeue        =       qdisc_requeue,
         .drop           =       qdisc_queue_drop,
         .init           =       fifo_init,
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index 504a78cdb718..3651da3e2802 100644
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
@@ -120,6 +120,19 @@ prio_requeue(struct sk_buff *skb, struct Qdisc* sch)
         return ret;
 }
 
+static struct sk_buff *prio_peek(struct Qdisc *sch)
+{
+        struct prio_sched_data *q = qdisc_priv(sch);
+        int prio;
+
+        for (prio = 0; prio < q->bands; prio++) {
+                struct Qdisc *qdisc = q->queues[prio];
+                struct sk_buff *skb = qdisc->ops->peek(qdisc);
+                if (skb)
+                        return skb;
+        }
+        return NULL;
+}
 
 static struct sk_buff *prio_dequeue(struct Qdisc* sch)
 {
@@ -421,6 +434,7 @@ static struct Qdisc_ops prio_qdisc_ops __read_mostly = {
         .priv_size      =       sizeof(struct prio_sched_data),
         .enqueue        =       prio_enqueue,
         .dequeue        =       prio_dequeue,
+        .peek           =       prio_peek,
         .requeue        =       prio_requeue,
         .drop           =       prio_drop,
         .init           =       prio_init,
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)
         return NET_XMIT_CN;
 }
 
+static struct sk_buff *
+sfq_peek(struct Qdisc *sch)
+{
+        struct sfq_sched_data *q = qdisc_priv(sch);
+        sfq_index a;
 
+        /* No active slots */
+        if (q->tail == SFQ_DEPTH)
+                return NULL;
 
+        a = q->next[q->tail];
+        return skb_peek(&q->qs[a]);
+}
 
 static struct sk_buff *
 sfq_dequeue(struct Qdisc *sch)
@@ -624,6 +635,7 @@ static struct Qdisc_ops sfq_qdisc_ops __read_mostly = {
         .priv_size      =       sizeof(struct sfq_sched_data),
         .enqueue        =       sfq_enqueue,
         .dequeue        =       sfq_dequeue,
+        .peek           =       sfq_peek,
         .requeue        =       sfq_requeue,
         .drop           =       sfq_drop,
         .init           =       sfq_init,