diff options
author | Eric Dumazet <edumazet@google.com> | 2012-05-10 01:36:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-10 23:33:01 -0400 |
commit | 2dd875ff31ac7ff42d6fc7d7f78ac6c0635439f5 (patch) | |
tree | c75209ccd8374f9695d4ec854d5b4bfb80c5e0dc /net/sched/sch_hfsc.c | |
parent | a6700db17980972199e61c06be535a79e1b0b4e6 (diff) |
net_sched: update bstats in dequeue()
Class bytes/packets stats can be misleading because they are updated in
enqueue() while packet might be dropped later.
We already fixed all qdiscs but sch_atm.
This patch makes the final cleanup.
class rate estimators can now match qdisc ones.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_hfsc.c')
-rw-r--r-- | net/sched/sch_hfsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index 8db3e2c72827..6c2ec4510540 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c | |||
@@ -1609,7 +1609,6 @@ hfsc_enqueue(struct sk_buff *skb, struct Qdisc *sch) | |||
1609 | if (cl->qdisc->q.qlen == 1) | 1609 | if (cl->qdisc->q.qlen == 1) |
1610 | set_active(cl, qdisc_pkt_len(skb)); | 1610 | set_active(cl, qdisc_pkt_len(skb)); |
1611 | 1611 | ||
1612 | bstats_update(&cl->bstats, skb); | ||
1613 | sch->q.qlen++; | 1612 | sch->q.qlen++; |
1614 | 1613 | ||
1615 | return NET_XMIT_SUCCESS; | 1614 | return NET_XMIT_SUCCESS; |
@@ -1657,6 +1656,7 @@ hfsc_dequeue(struct Qdisc *sch) | |||
1657 | return NULL; | 1656 | return NULL; |
1658 | } | 1657 | } |
1659 | 1658 | ||
1659 | bstats_update(&cl->bstats, skb); | ||
1660 | update_vf(cl, qdisc_pkt_len(skb), cur_time); | 1660 | update_vf(cl, qdisc_pkt_len(skb), cur_time); |
1661 | if (realtime) | 1661 | if (realtime) |
1662 | cl->cl_cumul += qdisc_pkt_len(skb); | 1662 | cl->cl_cumul += qdisc_pkt_len(skb); |