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>

1 files changed, 0 insertions, 63 deletions

diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index 198b83d42ba8..ab8cfee3c9ce 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -329,68 +329,6 @@ sfq_enqueue(struct sk_buff *skb, struct Qdisc *sch)
         return NET_XMIT_CN;
 }
 
-static int
-sfq_requeue(struct sk_buff *skb, struct Qdisc *sch)
-{
-        struct sfq_sched_data *q = qdisc_priv(sch);
-        unsigned int hash;
-        sfq_index x;
-        int ret;
-
-        hash = sfq_classify(skb, sch, &ret);
-        if (hash == 0) {
-                if (ret & __NET_XMIT_BYPASS)
-                        sch->qstats.drops++;
-                kfree_skb(skb);
-                return ret;
-        }
-        hash--;
-
-        x = q->ht[hash];
-        if (x == SFQ_DEPTH) {
-                q->ht[hash] = x = q->dep[SFQ_DEPTH].next;
-                q->hash[x] = hash;
-        }
-
-        sch->qstats.backlog += qdisc_pkt_len(skb);
-        __skb_queue_head(&q->qs[x], skb);
-        /* If selected queue has length q->limit+1, this means that
-         * all another queues are empty and we do simple tail drop.
-         * This packet is still requeued at head of queue, tail packet
-         * is dropped.
-         */
-        if (q->qs[x].qlen > q->limit) {
-                skb = q->qs[x].prev;
-                __skb_unlink(skb, &q->qs[x]);
-                sch->qstats.drops++;
-                sch->qstats.backlog -= qdisc_pkt_len(skb);
-                kfree_skb(skb);
-                return NET_XMIT_CN;
-        }
-
-        sfq_inc(q, x);
-        if (q->qs[x].qlen == 1) {               /* The flow is new */
-                if (q->tail == SFQ_DEPTH) {     /* It is the first flow */
-                        q->tail = x;
-                        q->next[x] = x;
-                        q->allot[x] = q->quantum;
-                } else {
-                        q->next[x] = q->next[q->tail];
-                        q->next[q->tail] = x;
-                        q->tail = x;
-                }
-        }
-
-        if (++sch->q.qlen <= q->limit) {
-                sch->qstats.requeues++;
-                return 0;
-        }
-
-        sch->qstats.drops++;
-        sfq_drop(sch);
-        return NET_XMIT_CN;
-}
-
 static struct sk_buff *
 sfq_peek(struct Qdisc *sch)
 {
@@ -636,7 +574,6 @@ static struct Qdisc_ops sfq_qdisc_ops __read_mostly = {
         .enqueue        =       sfq_enqueue,
         .dequeue        =       sfq_dequeue,
         .peek           =       sfq_peek,
-        .requeue        =       sfq_requeue,
         .drop           =       sfq_drop,
         .init           =       sfq_init,
         .reset          =       sfq_reset,