Commit 99c0db26 authored by Jarek Poplawski's avatar Jarek Poplawski Committed by David S. Miller

pkt_sched: sch_generic: Add generic qdisc->ops->peek() implementation.

With feedback from Patrick McHardy.
Signed-off-by: default avatarJarek Poplawski <jarkao2@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 48a8f519
...@@ -102,6 +102,10 @@ static int tclass_notify(struct sk_buff *oskb, struct nlmsghdr *n, ...@@ -102,6 +102,10 @@ static int tclass_notify(struct sk_buff *oskb, struct nlmsghdr *n,
requeues once dequeued packet. It is used for non-standard or requeues once dequeued packet. It is used for non-standard or
just buggy devices, which can defer output even if netif_queue_stopped()=0. just buggy devices, which can defer output even if netif_queue_stopped()=0.
---peek
like dequeue but without removing a packet from the queue
---reset ---reset
returns qdisc to initial state: purge all buffers, clear all returns qdisc to initial state: purge all buffers, clear all
...@@ -149,6 +153,14 @@ int register_qdisc(struct Qdisc_ops *qops) ...@@ -149,6 +153,14 @@ int register_qdisc(struct Qdisc_ops *qops)
qops->enqueue = noop_qdisc_ops.enqueue; qops->enqueue = noop_qdisc_ops.enqueue;
if (qops->requeue == NULL) if (qops->requeue == NULL)
qops->requeue = noop_qdisc_ops.requeue; qops->requeue = noop_qdisc_ops.requeue;
if (qops->peek == NULL) {
if (qops->dequeue == NULL) {
qops->peek = noop_qdisc_ops.peek;
} else {
rc = -EINVAL;
goto out;
}
}
if (qops->dequeue == NULL) if (qops->dequeue == NULL)
qops->dequeue = noop_qdisc_ops.dequeue; qops->dequeue = noop_qdisc_ops.dequeue;
......
...@@ -320,6 +320,7 @@ struct Qdisc_ops noop_qdisc_ops __read_mostly = { ...@@ -320,6 +320,7 @@ struct Qdisc_ops noop_qdisc_ops __read_mostly = {
.priv_size = 0, .priv_size = 0,
.enqueue = noop_enqueue, .enqueue = noop_enqueue,
.dequeue = noop_dequeue, .dequeue = noop_dequeue,
.peek = noop_dequeue,
.requeue = noop_requeue, .requeue = noop_requeue,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
...@@ -346,6 +347,7 @@ static struct Qdisc_ops noqueue_qdisc_ops __read_mostly = { ...@@ -346,6 +347,7 @@ static struct Qdisc_ops noqueue_qdisc_ops __read_mostly = {
.priv_size = 0, .priv_size = 0,
.enqueue = noop_enqueue, .enqueue = noop_enqueue,
.dequeue = noop_dequeue, .dequeue = noop_dequeue,
.peek = noop_dequeue,
.requeue = noop_requeue, .requeue = noop_requeue,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
...@@ -411,6 +413,19 @@ static struct sk_buff *pfifo_fast_dequeue(struct Qdisc* qdisc) ...@@ -411,6 +413,19 @@ static struct sk_buff *pfifo_fast_dequeue(struct Qdisc* qdisc)
return NULL; return NULL;
} }
static struct sk_buff *pfifo_fast_peek(struct Qdisc* qdisc)
{
int prio;
struct sk_buff_head *list = qdisc_priv(qdisc);
for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) {
if (!skb_queue_empty(list + prio))
return skb_peek(list + prio);
}
return NULL;
}
static int pfifo_fast_requeue(struct sk_buff *skb, struct Qdisc* qdisc) static int pfifo_fast_requeue(struct sk_buff *skb, struct Qdisc* qdisc)
{ {
qdisc->q.qlen++; qdisc->q.qlen++;
...@@ -457,6 +472,7 @@ static struct Qdisc_ops pfifo_fast_ops __read_mostly = { ...@@ -457,6 +472,7 @@ static struct Qdisc_ops pfifo_fast_ops __read_mostly = {
.priv_size = PFIFO_FAST_BANDS * sizeof(struct sk_buff_head), .priv_size = PFIFO_FAST_BANDS * sizeof(struct sk_buff_head),
.enqueue = pfifo_fast_enqueue, .enqueue = pfifo_fast_enqueue,
.dequeue = pfifo_fast_dequeue, .dequeue = pfifo_fast_dequeue,
.peek = pfifo_fast_peek,
.requeue = pfifo_fast_requeue, .requeue = pfifo_fast_requeue,
.init = pfifo_fast_init, .init = pfifo_fast_init,
.reset = pfifo_fast_reset, .reset = pfifo_fast_reset,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment