Skip to content

Commit

Permalink
net/sched: taprio: Fix init procedure
Browse files Browse the repository at this point in the history
Commit 1351170 ("net: taprio offload: enforce qdisc to netdev queue mapping")
resulted in duplicate entries in the qdisc hash.
While this did not impact the overall operation of the qdisc and taprio
code paths, it did result in an infinite loop when dumping the qdisc
properties, at least on one target (NXP LS1028 ARDB).
Removing the duplicate call to qdisc_hash_add() solves the problem.

Fixes: 1351170 ("net: taprio offload: enforce qdisc to netdev queue mapping")
Signed-off-by: Yannick Vignon <yannick.vignon@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Yannick Vignon authored and David S. Miller committed Aug 2, 2021
1 parent d51c590 commit ebca25e
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions net/sched/sch_taprio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1739,8 +1739,6 @@ static void taprio_attach(struct Qdisc *sch)
if (FULL_OFFLOAD_IS_ENABLED(q->flags)) {
qdisc->flags |= TCQ_F_ONETXQUEUE | TCQ_F_NOPARENT;
old = dev_graft_qdisc(qdisc->dev_queue, qdisc);
if (ntx < dev->real_num_tx_queues)
qdisc_hash_add(qdisc, false);
} else {
old = dev_graft_qdisc(qdisc->dev_queue, sch);
qdisc_refcount_inc(sch);
Expand Down

0 comments on commit ebca25e

Please sign in to comment.