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, 21 deletions

diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c
index cb20ee3b9fc2..40408d595c08 100644
--- a/net/sched/sch_gred.c
+++ b/net/sched/sch_gred.c
@@ -240,26 +240,6 @@ congestion_drop:
         return NET_XMIT_CN;
 }
 
-static int gred_requeue(struct sk_buff *skb, struct Qdisc* sch)
-{
-        struct gred_sched *t = qdisc_priv(sch);
-        struct gred_sched_data *q;
-        u16 dp = tc_index_to_dp(skb);
-
-        if (dp >= t->DPs || (q = t->tab[dp]) == NULL) {
-                if (net_ratelimit())
-                        printk(KERN_WARNING "GRED: Unable to relocate VQ 0x%x "
-                               "for requeue, screwing up backlog.\n",
-                               tc_index_to_dp(skb));
-        } else {
-                if (red_is_idling(&q->parms))
-                        red_end_of_idle_period(&q->parms);
-                q->backlog += qdisc_pkt_len(skb);
-        }
-
-        return qdisc_requeue(skb, sch);
-}
-
 static struct sk_buff *gred_dequeue(struct Qdisc* sch)
 {
         struct sk_buff *skb;
@@ -603,7 +583,6 @@ static struct Qdisc_ops gred_qdisc_ops __read_mostly = {
         .enqueue        =       gred_enqueue,
         .dequeue        =       gred_dequeue,
         .peek           =       qdisc_peek_head,
-        .requeue        =       gred_requeue,
         .drop           =       gred_drop,
         .init           =       gred_init,
         .reset          =       gred_reset,