Skip to contentSkip to conversation

PKT_SCHED: Avoid duplicated TCA_STATS TLVs for HTB and HFSC

PATCH Applied Thomas Graf 2 participants 2 messages Oct 22, 2004

Subsystems (3)
Networking Network drivers Traffic control (tc)
lore
Share & tools
lore

Thomas Graf

author
#0 lore raw

PATCH 1/1 PKT_SCHED: Avoid duplicated TCA_STATS TLVs for HTB and HFSC

Dave,

Backport of the equivalent 2.6 fixes.

Qdiscs are not supposed to dump TCA_STATS, it is done in generic code part.

Signed-off-by Thomas Graf <[email protected]>
net/sched/sch_htb.c +0 -2
@@ -1287,8 +1287,6 @@
 	RTA_PUT(skb, TCA_OPTIONS, 0, NULL);
 	RTA_PUT(skb, TCA_HTB_INIT, sizeof(gopt), &gopt);
 	rta->rta_len = skb->tail - b;
-	sch->stats.qlen = sch->q.qlen;
-	RTA_PUT(skb, TCA_STATS, sizeof(sch->stats), &sch->stats);
 	HTB_QUNLOCK(sch);
 	return skb->len;
 rtattr_failure:
net/sched/sch_hfsc.c +0 -4
@@ -1628,10 +1628,6 @@
 	qopt.defcls = q->defcls;
 	RTA_PUT(skb, TCA_OPTIONS, sizeof(qopt), &qopt);
 
-	sch->stats.qlen = sch->q.qlen;
-	if (qdisc_copy_stats(skb, &sch->stats) < 0)
-		goto rtattr_failure;
-
 	return skb->len;
 
  rtattr_failure: