* [PATCH 2.4] PKT_SCHED: Avoid duplicated TCA_STATS TLVs for HTB and HFSC
@ 2004-10-22 10:05 Thomas Graf
2004-10-22 22:20 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Graf @ 2004-10-22 10:05 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev
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 <tgraf@suug.ch>
--- linux-2.4.28-pre4-bk6.orig/net/sched/sch_htb.c 2004-10-22 10:58:23.000000000 +0200
+++ linux-2.4.28-pre4-bk6/net/sched/sch_htb.c 2004-10-22 10:59:30.000000000 +0200
@@ -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:
--- linux-2.4.28-pre4-bk6.orig/net/sched/sch_hfsc.c 2004-10-22 10:58:23.000000000 +0200
+++ linux-2.4.28-pre4-bk6/net/sched/sch_hfsc.c 2004-10-22 11:00:46.000000000 +0200
@@ -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:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-10-22 22:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-10-22 10:05 [PATCH 2.4] PKT_SCHED: Avoid duplicated TCA_STATS TLVs for HTB and HFSC Thomas Graf
2004-10-22 22:20 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).