From: Thomas Graf <tgraf@suug.ch>
To: "David S. Miller" <davem@davemloft.net>
Cc: netdev@oss.sgi.com
Subject: [PATCH 2.4] PKT_SCHED: Avoid duplicated TCA_STATS TLVs for HTB and HFSC
Date: Fri, 22 Oct 2004 12:05:17 +0200 [thread overview]
Message-ID: <20041022100517.GY21977@postel.suug.ch> (raw)
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:
next reply other threads:[~2004-10-22 10:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-10-22 10:05 Thomas Graf [this message]
2004-10-22 22:20 ` [PATCH 2.4] PKT_SCHED: Avoid duplicated TCA_STATS TLVs for HTB and HFSC David S. Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041022100517.GY21977@postel.suug.ch \
--to=tgraf@suug.ch \
--cc=davem@davemloft.net \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).