diff options
| author | Florian Westphal <fw@strlen.de> | 2016-06-09 00:27:42 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-08 23:58:52 -0700 |
| commit | a09ceb0e08140a1eec05b49b4c232d3481339cb0 (patch) | |
| tree | d177eeb840ee48563ba195fa6de159125fa1019b /net/sched/sch_cbq.c | |
| parent | c3a173d7dba2d7c74dd4ab871b8f22bf56ac10b2 (diff) | |
| download | linux-stable-a09ceb0e08140a1eec05b49b4c232d3481339cb0.tar.gz linux-stable-a09ceb0e08140a1eec05b49b4c232d3481339cb0.tar.bz2 linux-stable-a09ceb0e08140a1eec05b49b4c232d3481339cb0.zip | |
sched: remove qdisc->drop
after removal of TCA_CBQ_OVL_STRATEGY from cbq scheduler, there are no
more callers of ->drop() outside of other ->drop functions, i.e.
nothing calls them.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_cbq.c')
| -rw-r--r-- | net/sched/sch_cbq.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index 7f4d6c5a0efe..f2af31be6370 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c @@ -1025,31 +1025,6 @@ static void cbq_link_class(struct cbq_class *this) } } -static unsigned int cbq_drop(struct Qdisc *sch) -{ - struct cbq_sched_data *q = qdisc_priv(sch); - struct cbq_class *cl, *cl_head; - int prio; - unsigned int len; - - for (prio = TC_CBQ_MAXPRIO; prio >= 0; prio--) { - cl_head = q->active[prio]; - if (!cl_head) - continue; - - cl = cl_head; - do { - if (cl->q->ops->drop && (len = cl->q->ops->drop(cl->q))) { - sch->q.qlen--; - if (!cl->q->q.qlen) - cbq_deactivate_class(cl); - return len; - } - } while ((cl = cl->next_alive) != cl_head); - } - return 0; -} - static void cbq_reset(struct Qdisc *sch) { @@ -1791,7 +1766,6 @@ static struct Qdisc_ops cbq_qdisc_ops __read_mostly = { .enqueue = cbq_enqueue, .dequeue = cbq_dequeue, .peek = qdisc_peek_dequeued, - .drop = cbq_drop, .init = cbq_init, .reset = cbq_reset, .destroy = cbq_destroy, |