Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7618f5e2 authored by Maximilian Heyne's avatar Maximilian Heyne Committed by Greg Kroah-Hartman
Browse files

net: sched: avoid duplicates in classes dump 



commit bfc2560563586372212b0a8aeca7428975fa91fe upstream.

This is a follow up of commit ea327469 ("net: sched: avoid
duplicates in qdisc dump") which has fixed the issue only for the qdisc
dump.

The duplicate printing also occurs when dumping the classes via
  tc class show dev eth0

Fixes: 59cc1f61 ("net: sched: convert qdisc linked list to hashtable")
Signed-off-by: default avatarMaximilian Heyne <mheyne@amazon.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 75756ebd

net/sched/sch_api.c

+4 −4
Original line number Diff line number Diff line
@@ -2048,7 +2048,7 @@ static int tc_dump_tclass_qdisc(struct Qdisc *q, struct sk_buff *skb, 


static int tc_dump_tclass_root(struct Qdisc *root, struct sk_buff *skb,

			       struct tcmsg *tcm, struct netlink_callback *cb,

			       int *t_p, int s_t)

			       int *t_p, int s_t, bool recur)

{

	struct Qdisc *q;

	int b;
@@ -2059,7 +2059,7 @@ static int tc_dump_tclass_root(struct Qdisc *root, struct sk_buff *skb, 
	if (tc_dump_tclass_qdisc(root, skb, tcm, cb, t_p, s_t) < 0)

		return -1;



	if (!qdisc_dev(root))

	if (!qdisc_dev(root) || !recur)

		return 0;



	if (tcm->tcm_parent) {
@@ -2094,13 +2094,13 @@ static int tc_dump_tclass(struct sk_buff *skb, struct netlink_callback *cb) 
	s_t = cb->args[0];

	t = 0;



	if (tc_dump_tclass_root(dev->qdisc, skb, tcm, cb, &t, s_t) < 0)

	if (tc_dump_tclass_root(dev->qdisc, skb, tcm, cb, &t, s_t, true) < 0)

		goto done;



	dev_queue = dev_ingress_queue(dev);

	if (dev_queue &&

	    tc_dump_tclass_root(dev_queue->qdisc_sleeping, skb, tcm, cb,

				&t, s_t) < 0)

				&t, s_t, false) < 0)

		goto done;



done: