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

diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index 3651da3e2802..ea65a87ec22c 100644
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
@@ -93,33 +93,6 @@ prio_enqueue(struct sk_buff *skb, struct Qdisc *sch)
         return ret;
 }
 
-
-static int
-prio_requeue(struct sk_buff *skb, struct Qdisc* sch)
-{
-        struct Qdisc *qdisc;
-        int ret;
-
-        qdisc = prio_classify(skb, sch, &ret);
-#ifdef CONFIG_NET_CLS_ACT
-        if (qdisc == NULL) {
-                if (ret & __NET_XMIT_BYPASS)
-                        sch->qstats.drops++;
-                kfree_skb(skb);
-                return ret;
-        }
-#endif
-
-        if ((ret = qdisc->ops->requeue(skb, qdisc)) == NET_XMIT_SUCCESS) {
-                sch->q.qlen++;
-                sch->qstats.requeues++;
-                return NET_XMIT_SUCCESS;
-        }
-        if (net_xmit_drop_count(ret))
-                sch->qstats.drops++;
-        return ret;
-}
-
 static struct sk_buff *prio_peek(struct Qdisc *sch)
 {
         struct prio_sched_data *q = qdisc_priv(sch);
@@ -435,7 +408,6 @@ static struct Qdisc_ops prio_qdisc_ops __read_mostly = {
         .enqueue        =       prio_enqueue,
         .dequeue        =       prio_dequeue,
         .peek           =       prio_peek,
-        .requeue        =       prio_requeue,
         .drop           =       prio_drop,
         .init           =       prio_init,
         .reset          =       prio_reset,