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

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 64ae1ba9f554..f8c47429044a 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -53,7 +53,6 @@ struct Qdisc
         atomic_t                refcnt;
         unsigned long           state;
         struct sk_buff          *gso_skb;
-        struct sk_buff_head     requeue;
         struct sk_buff_head     q;
         struct netdev_queue     *dev_queue;
         struct Qdisc            *next_sched;
@@ -112,7 +111,6 @@ struct Qdisc_ops
         int                     (*enqueue)(struct sk_buff *, struct Qdisc *);
         struct sk_buff *        (*dequeue)(struct Qdisc *);
         struct sk_buff *        (*peek)(struct Qdisc *);
-        int                     (*requeue)(struct sk_buff *, struct Qdisc *);
         unsigned int            (*drop)(struct Qdisc *);
 
         int                     (*init)(struct Qdisc *, struct nlattr *arg);
@@ -467,21 +465,6 @@ static inline struct sk_buff *qdisc_dequeue_peeked(struct Qdisc *sch)
         return skb;
 }
 
-static inline int __qdisc_requeue(struct sk_buff *skb, struct Qdisc *sch,
-                                  struct sk_buff_head *list)
-{
-        __skb_queue_head(list, skb);
-        sch->qstats.backlog += qdisc_pkt_len(skb);
-        sch->qstats.requeues++;
-
-        return NET_XMIT_SUCCESS;
-}
-
-static inline int qdisc_requeue(struct sk_buff *skb, struct Qdisc *sch)
-{
-        return __qdisc_requeue(skb, sch, &sch->q);
-}
-
 static inline void __qdisc_reset_queue(struct Qdisc *sch,
                                        struct sk_buff_head *list)
 {