diff options
| author |   WANG Cong <xiyou.wangcong@gmail.com> | 2015-10-07 16:47:32 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-10-11 04:49:33 -0700 |
| commit | 6ac644a8ae2dabf884a1b01e82e32d96ffe6eee5 (patch) | |
| tree | b9a9bc685d2acf1f7d5a01350b051acfb7696b95 /net/sched/sch_hhf.c | |
| parent | Merge branch 'mlx' (diff) | |
| download | linux-dev-6ac644a8ae2dabf884a1b01e82e32d96ffe6eee5.tar.xz linux-dev-6ac644a8ae2dabf884a1b01e82e32d96ffe6eee5.zip | |
sch_hhf: fix return value of hhf_drop()
Similar to commit c0afd9ce4d6a ("fq_codel: fix return value of fq_codel_drop()")
->drop() is supposed to return the number of bytes it dropped,
but hhf_drop () returns the id of the bucket where it drops
a packet from.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Terry Lam <vtlam@google.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_hhf.c')
| -rw-r--r-- | net/sched/sch_hhf.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/net/sched/sch_hhf.c b/net/sched/sch_hhf.c index 9d15cb6b8cb1..86b04e31e60b 100644 --- a/net/sched/sch_hhf.c +++ b/net/sched/sch_hhf.c @@ -368,6 +368,15 @@ static unsigned int hhf_drop(struct Qdisc *sch) return bucket - q->buckets; } +static unsigned int hhf_qdisc_drop(struct Qdisc *sch) +{ + unsigned int prev_backlog; + + prev_backlog = sch->qstats.backlog; + hhf_drop(sch); + return prev_backlog - sch->qstats.backlog; +} + static int hhf_enqueue(struct sk_buff *skb, struct Qdisc *sch) { struct hhf_sched_data *q = qdisc_priv(sch); @@ -696,7 +705,7 @@ static struct Qdisc_ops hhf_qdisc_ops __read_mostly = { .enqueue = hhf_enqueue, .dequeue = hhf_dequeue, .peek = qdisc_peek_dequeued, - .drop = hhf_drop, + .drop = hhf_qdisc_drop, .init = hhf_init, .reset = hhf_reset, .destroy = hhf_destroy, |