diff options
| author | Jarek Poplawski <jarkao2@gmail.com> | 2008-11-13 22:56:30 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-13 22:56:30 -0800 |
| commit | f30ab418a1d3c5a8b83493e7d70d6876a74aa0ce (patch) | |
| tree | 271f0d093d2436b0d0ebdff151fc4f5b1fb15f21 /include/net/sch_generic.h | |
| parent | 38a7ddffa4b79d7b1fbc9bf2fa82b21b72622858 (diff) | |
| download | op-kernel-dev-f30ab418a1d3c5a8b83493e7d70d6876a74aa0ce.zip op-kernel-dev-f30ab418a1d3c5a8b83493e7d70d6876a74aa0ce.tar.gz | |
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>
Diffstat (limited to 'include/net/sch_generic.h')
| -rw-r--r-- | include/net/sch_generic.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 64ae1ba..f8c4742 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) { |
