diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-06-10 16:41:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-10 23:58:20 -0700 |
| commit | cca605dd4b3b2bfa381250b7dbbe16b124916f24 (patch) | |
| tree | a1dde5e043514772fcb539d1b76d7d2567d952de /net/sched/sch_cbq.c | |
| parent | 8fe6a79fb8088a759b3dc57eb641fc3183ad72b8 (diff) | |
| download | linux-cca605dd4b3b2bfa381250b7dbbe16b124916f24.tar.gz linux-cca605dd4b3b2bfa381250b7dbbe16b124916f24.tar.bz2 linux-cca605dd4b3b2bfa381250b7dbbe16b124916f24.zip | |
net_sched: cbq: remove a flaky use of qdisc_is_throttled()
So far no qdisc ever unset the throttled bit at enqueue() time,
so CBQ usage of qdisc_is_throttled() was flaky.
Since __QDISC_STATE_THROTTLED set/unset is way too expensive
considering that only CBQ was eventually caring for this status,
it would make sense to implement a Qdisc ops ->is_throttled()
if we find that this is needed.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_cbq.c')
| -rw-r--r-- | net/sched/sch_cbq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index f2af31be6370..6e61f9aa8783 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c @@ -345,7 +345,7 @@ cbq_mark_toplevel(struct cbq_sched_data *q, struct cbq_class *cl) { int toplevel = q->toplevel; - if (toplevel > cl->level && !(qdisc_is_throttled(cl->q))) { + if (toplevel > cl->level) { psched_time_t now = psched_get_time(); do { |