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_netem.c | |
| parent | sched: remove qdisc_rehape_fail (diff) | |
| download | linux-dev-a09ceb0e08140a1eec05b49b4c232d3481339cb0.tar.xz linux-dev-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_netem.c')
| -rw-r--r-- | net/sched/sch_netem.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 31984c708382..9ca7947ab643 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -576,35 +576,6 @@ finish_segs: return NET_XMIT_SUCCESS; } -static unsigned int netem_drop(struct Qdisc *sch) -{ - struct netem_sched_data *q = qdisc_priv(sch); - unsigned int len; - - len = qdisc_queue_drop(sch); - - if (!len) { - struct rb_node *p = rb_first(&q->t_root); - - if (p) { - struct sk_buff *skb = netem_rb_to_skb(p); - - rb_erase(p, &q->t_root); - sch->q.qlen--; - skb->next = NULL; - skb->prev = NULL; - qdisc_qstats_backlog_dec(sch, skb); - kfree_skb(skb); - } - } - if (!len && q->qdisc && q->qdisc->ops->drop) - len = q->qdisc->ops->drop(q->qdisc); - if (len) - qdisc_qstats_drop(sch); - - return len; -} - static struct sk_buff *netem_dequeue(struct Qdisc *sch) { struct netem_sched_data *q = qdisc_priv(sch); @@ -1143,7 +1114,6 @@ static struct Qdisc_ops netem_qdisc_ops __read_mostly = { .enqueue = netem_enqueue, .dequeue = netem_dequeue, .peek = qdisc_peek_dequeued, - .drop = netem_drop, .init = netem_init, .reset = netem_reset, .destroy = netem_destroy, |