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_htb.c | |
| parent | c3a173d7dba2d7c74dd4ab871b8f22bf56ac10b2 (diff) | |
| download | linux-a09ceb0e08140a1eec05b49b4c232d3481339cb0.tar.gz linux-a09ceb0e08140a1eec05b49b4c232d3481339cb0.tar.bz2 linux-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_htb.c')
| -rw-r--r-- | net/sched/sch_htb.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 2b057649f24b..b74d06668ab4 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -936,31 +936,6 @@ fin: return skb; } -/* try to drop from each class (by prio) until one succeed */ -static unsigned int htb_drop(struct Qdisc *sch) -{ - struct htb_sched *q = qdisc_priv(sch); - int prio; - - for (prio = TC_HTB_NUMPRIO - 1; prio >= 0; prio--) { - struct list_head *p; - list_for_each(p, q->drops + prio) { - struct htb_class *cl = list_entry(p, struct htb_class, - un.leaf.drop_list); - unsigned int len; - if (cl->un.leaf.q->ops->drop && - (len = cl->un.leaf.q->ops->drop(cl->un.leaf.q))) { - sch->qstats.backlog -= len; - sch->q.qlen--; - if (!cl->un.leaf.q->q.qlen) - htb_deactivate(q, cl); - return len; - } - } - } - return 0; -} - /* reset all classes */ /* always caled under BH & queue lock */ static void htb_reset(struct Qdisc *sch) @@ -1600,7 +1575,6 @@ static struct Qdisc_ops htb_qdisc_ops __read_mostly = { .enqueue = htb_enqueue, .dequeue = htb_dequeue, .peek = qdisc_peek_dequeued, - .drop = htb_drop, .init = htb_init, .reset = htb_reset, .destroy = htb_destroy, |