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_dsmark.c b/net/sched/sch_dsmark.c
index 3e491479ea86..3f9427a4b757 100644
--- a/net/sched/sch_dsmark.c
+++ b/net/sched/sch_dsmark.c
@@ -322,26 +322,6 @@ static struct sk_buff *dsmark_peek(struct Qdisc *sch)
         return p->q->ops->peek(p->q);
 }
 
-static int dsmark_requeue(struct sk_buff *skb, struct Qdisc *sch)
-{
-        struct dsmark_qdisc_data *p = qdisc_priv(sch);
-        int err;
-
-        pr_debug("dsmark_requeue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p);
-
-        err = p->q->ops->requeue(skb, p->q);
-        if (err != NET_XMIT_SUCCESS) {
-                if (net_xmit_drop_count(err))
-                        sch->qstats.drops++;
-                return err;
-        }
-
-        sch->q.qlen++;
-        sch->qstats.requeues++;
-
-        return NET_XMIT_SUCCESS;
-}
-
 static unsigned int dsmark_drop(struct Qdisc *sch)
 {
         struct dsmark_qdisc_data *p = qdisc_priv(sch);
@@ -506,7 +486,6 @@ static struct Qdisc_ops dsmark_qdisc_ops __read_mostly = {
         .enqueue        =       dsmark_enqueue,
         .dequeue        =       dsmark_dequeue,
         .peek           =       dsmark_peek,
-        .requeue        =       dsmark_requeue,
         .drop           =       dsmark_drop,
         .init           =       dsmark_init,
         .reset          =       dsmark_reset,