diff options
author | Jarek Poplawski <jarkao2@gmail.com> | 2008-11-14 01:56:30 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-14 01:56:30 -0500 |
commit | f30ab418a1d3c5a8b83493e7d70d6876a74aa0ce (patch) | |
tree | 271f0d093d2436b0d0ebdff151fc4f5b1fb15f21 /net/sched/sch_teql.c | |
parent | 38a7ddffa4b79d7b1fbc9bf2fa82b21b72622858 (diff) |
pkt_sched: Remove qdisc->ops->requeue() etc.
After implementing qdisc->ops->peek() and changing sch_netem into
classless qdisc there are no more qdisc->ops->requeue() users. This
patch removes this method with its wrappers (qdisc_requeue()), and
also unused qdisc->requeue structure. There are a few minor fixes of
warnings (htb_enqueue()) and comments btw.
The idea to kill ->requeue() and a similar patch were first developed
by David S. Miller.
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_teql.c')
-rw-r--r-- | net/sched/sch_teql.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index bf03e7fa1849..cfc8e7caba62 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c | |||
@@ -93,16 +93,6 @@ teql_enqueue(struct sk_buff *skb, struct Qdisc* sch) | |||
93 | return NET_XMIT_DROP; | 93 | return NET_XMIT_DROP; |
94 | } | 94 | } |
95 | 95 | ||
96 | static int | ||
97 | teql_requeue(struct sk_buff *skb, struct Qdisc* sch) | ||
98 | { | ||
99 | struct teql_sched_data *q = qdisc_priv(sch); | ||
100 | |||
101 | __skb_queue_head(&q->q, skb); | ||
102 | sch->qstats.requeues++; | ||
103 | return 0; | ||
104 | } | ||
105 | |||
106 | static struct sk_buff * | 96 | static struct sk_buff * |
107 | teql_dequeue(struct Qdisc* sch) | 97 | teql_dequeue(struct Qdisc* sch) |
108 | { | 98 | { |
@@ -441,7 +431,6 @@ static __init void teql_master_setup(struct net_device *dev) | |||
441 | ops->enqueue = teql_enqueue; | 431 | ops->enqueue = teql_enqueue; |
442 | ops->dequeue = teql_dequeue; | 432 | ops->dequeue = teql_dequeue; |
443 | ops->peek = teql_peek; | 433 | ops->peek = teql_peek; |
444 | ops->requeue = teql_requeue; | ||
445 | ops->init = teql_qdisc_init; | 434 | ops->init = teql_qdisc_init; |
446 | ops->reset = teql_reset; | 435 | ops->reset = teql_reset; |
447 | ops->destroy = teql_destroy; | 436 | ops->destroy = teql_destroy; |