AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

fq_codel: fix return value of fq_codel_drop()

Browse Source 
The ->drop() is supposed to return the number of bytes it dropped,
however fq_codel_drop() returns the index of the flow where it drops
a packet from.

Fix this by introducing a helper to wrap fq_codel_drop().

Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Cong Wang <cwang@twopensource.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
WANG Cong 2015-07-14 11:21:58 -07:00 committed by David S. Miller
parent e8d092aafd
commit c0afd9ce4d
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/sched/sch_fq_codel.c
View File

@ -163,6 +163,15 @@ static unsigned int fq_codel_drop(struct Qdisc *sch)
return idx; return idx;
} }
static unsigned int fq_codel_qdisc_drop(struct Qdisc *sch)
{
unsigned int prev_backlog;
prev_backlog = sch->qstats.backlog;
fq_codel_drop(sch);
return prev_backlog - sch->qstats.backlog;
}
static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch) static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch)
{ {
struct fq_codel_sched_data *q = qdisc_priv(sch); struct fq_codel_sched_data *q = qdisc_priv(sch);
@ -604,7 +613,7 @@ static struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
.enqueue = fq_codel_enqueue, .enqueue = fq_codel_enqueue,
.dequeue = fq_codel_dequeue, .dequeue = fq_codel_dequeue,
.peek = qdisc_peek_dequeued, .peek = qdisc_peek_dequeued,
.drop = fq_codel_drop, .drop = fq_codel_qdisc_drop,
.init = fq_codel_init, .init = fq_codel_init,
.reset = fq_codel_reset, .reset = fq_codel_reset,
.destroy = fq_codel_destroy, .destroy = fq_codel_destroy,