diff options
author | John Fastabend <john.fastabend@gmail.com> | 2014-09-28 14:53:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-30 01:02:26 -0400 |
commit | 25331d6ce42bcf4b34b6705fce4da15c3fabe62f (patch) | |
tree | 1c2d92a220f90f155de62a435753f09ff0c9ce91 /net/sched/sch_htb.c | |
parent | 22e0f8b9322cb1a48b1357e8f4ae6f5a9eca8cfa (diff) |
net: sched: implement qstat helper routines
This adds helpers to manipulate qstats logic and replaces locations
that touch the counters directly. This simplifies future patches
to push qstats onto per cpu counters.
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 0256dee69bd6..c40ab7a98c50 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c | |||
@@ -586,13 +586,13 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch) | |||
586 | #ifdef CONFIG_NET_CLS_ACT | 586 | #ifdef CONFIG_NET_CLS_ACT |
587 | } else if (!cl) { | 587 | } else if (!cl) { |
588 | if (ret & __NET_XMIT_BYPASS) | 588 | if (ret & __NET_XMIT_BYPASS) |
589 | sch->qstats.drops++; | 589 | qdisc_qstats_drop(sch); |
590 | kfree_skb(skb); | 590 | kfree_skb(skb); |
591 | return ret; | 591 | return ret; |
592 | #endif | 592 | #endif |
593 | } else if ((ret = qdisc_enqueue(skb, cl->un.leaf.q)) != NET_XMIT_SUCCESS) { | 593 | } else if ((ret = qdisc_enqueue(skb, cl->un.leaf.q)) != NET_XMIT_SUCCESS) { |
594 | if (net_xmit_drop_count(ret)) { | 594 | if (net_xmit_drop_count(ret)) { |
595 | sch->qstats.drops++; | 595 | qdisc_qstats_drop(sch); |
596 | cl->qstats.drops++; | 596 | cl->qstats.drops++; |
597 | } | 597 | } |
598 | return ret; | 598 | return ret; |
@@ -925,7 +925,7 @@ ok: | |||
925 | goto ok; | 925 | goto ok; |
926 | } | 926 | } |
927 | } | 927 | } |
928 | sch->qstats.overlimits++; | 928 | qdisc_qstats_overlimit(sch); |
929 | if (likely(next_event > q->now)) { | 929 | if (likely(next_event > q->now)) { |
930 | if (!test_bit(__QDISC_STATE_DEACTIVATED, | 930 | if (!test_bit(__QDISC_STATE_DEACTIVATED, |
931 | &qdisc_root_sleeping(q->watchdog.qdisc)->state)) { | 931 | &qdisc_root_sleeping(q->watchdog.qdisc)->state)) { |