summaryrefslogtreecommitdiff
path: root/net/sched
diff options
context:
space:
mode:
authorAndre Guedes <andre.guedes@intel.com>2019-04-23 22:44:24 +0300
committerDavid S. Miller <davem@davemloft.net>2019-04-24 05:52:32 +0300
commit6e734c82be63ef6a0032c29f6d406d60e4386050 (patch)
tree4ac73d61738f66cbb6d4577ae2f2d5635f3a0e3f /net/sched
parent2684d1b75f215bdf521064bcbc0015dfca9156e7 (diff)
downloadlinux-6e734c82be63ef6a0032c29f6d406d60e4386050.tar.xz
net: sched: taprio: Fix taprio_dequeue()
In case we don't have 'guard' or 'budget' to transmit the skb, we should continue traversing the qdisc list since the remaining guard/budget might be enough to transmit a skb from other children qdiscs. Fixes: 5a781ccbd19e (“tc: Add support for configuring the taprio scheduler”) Signed-off-by: Andre Guedes <andre.guedes@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/sch_taprio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index 0df924f87f3e..df848a36b222 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -188,12 +188,12 @@ static struct sk_buff *taprio_dequeue(struct Qdisc *sch)
*/
if (gate_mask != TAPRIO_ALL_GATES_OPEN &&
ktime_after(guard, entry->close_time))
- return NULL;
+ continue;
/* ... and no budget. */
if (gate_mask != TAPRIO_ALL_GATES_OPEN &&
atomic_sub_return(len, &entry->budget) < 0)
- return NULL;
+ continue;
skb = child->ops->dequeue(child);
if (unlikely(!skb))