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, 1 insertions, 19 deletions

diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
index 6eb9a650b63d..ca90f6e59aee 100644
--- a/net/sched/sch_atm.c
+++ b/net/sched/sch_atm.c
@@ -62,7 +62,7 @@ struct atm_qdisc_data {
         struct atm_flow_data    link;           /* unclassified skbs go here */
         struct atm_flow_data    *flows;         /* NB: "link" is also on this
                                                    list */
-        struct tasklet_struct   task;           /* requeue tasklet */
+        struct tasklet_struct   task;           /* dequeue tasklet */
 };
 
 /* ------------------------- Class/flow operations ------------------------- */
@@ -534,23 +534,6 @@ static struct sk_buff *atm_tc_peek(struct Qdisc *sch)
         return p->link.q->ops->peek(p->link.q);
 }
 
-static int atm_tc_requeue(struct sk_buff *skb, struct Qdisc *sch)
-{
-        struct atm_qdisc_data *p = qdisc_priv(sch);
-        int ret;
-
-        pr_debug("atm_tc_requeue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p);
-        ret = p->link.q->ops->requeue(skb, p->link.q);
-        if (!ret) {
-                sch->q.qlen++;
-                sch->qstats.requeues++;
-        } else if (net_xmit_drop_count(ret)) {
-                sch->qstats.drops++;
-                p->link.qstats.drops++;
-        }
-        return ret;
-}
-
 static unsigned int atm_tc_drop(struct Qdisc *sch)
 {
         struct atm_qdisc_data *p = qdisc_priv(sch);
@@ -707,7 +690,6 @@ static struct Qdisc_ops atm_qdisc_ops __read_mostly = {
         .enqueue        = atm_tc_enqueue,
         .dequeue        = atm_tc_dequeue,
         .peek           = atm_tc_peek,
-        .requeue        = atm_tc_requeue,
         .drop           = atm_tc_drop,
         .init           = atm_tc_init,
         .reset          = atm_tc_reset,