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_api.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_api.c')
-rw-r--r-- | net/sched/sch_api.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index e5646614e88d..5bcef13408c8 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
@@ -97,11 +97,6 @@ static int tclass_notify(struct sk_buff *oskb, struct nlmsghdr *n, | |||
97 | 97 | ||
98 | Auxiliary routines: | 98 | Auxiliary routines: |
99 | 99 | ||
100 | ---requeue | ||
101 | |||
102 | requeues once dequeued packet. It is used for non-standard or | ||
103 | just buggy devices, which can defer output even if netif_queue_stopped()=0. | ||
104 | |||
105 | ---peek | 100 | ---peek |
106 | 101 | ||
107 | like dequeue but without removing a packet from the queue | 102 | like dequeue but without removing a packet from the queue |
@@ -151,8 +146,6 @@ int register_qdisc(struct Qdisc_ops *qops) | |||
151 | 146 | ||
152 | if (qops->enqueue == NULL) | 147 | if (qops->enqueue == NULL) |
153 | qops->enqueue = noop_qdisc_ops.enqueue; | 148 | qops->enqueue = noop_qdisc_ops.enqueue; |
154 | if (qops->requeue == NULL) | ||
155 | qops->requeue = noop_qdisc_ops.requeue; | ||
156 | if (qops->peek == NULL) { | 149 | if (qops->peek == NULL) { |
157 | if (qops->dequeue == NULL) { | 150 | if (qops->dequeue == NULL) { |
158 | qops->peek = noop_qdisc_ops.peek; | 151 | qops->peek = noop_qdisc_ops.peek; |