From: Thomas Graf <tgraf@suug.ch>
To: "David S. Miller" <davem@davemloft.net>
Cc: netdev@oss.sgi.com, hadi@cyberus.ca
Subject: [PATCH 3/8] ipt: use gnet_stats for action stats
Date: Wed, 3 Nov 2004 23:00:26 +0100 [thread overview]
Message-ID: <20041103220026.GD12289@postel.suug.ch> (raw)
In-Reply-To: <20041103215816.GA12289@postel.suug.ch>
Signed-off-by: Thomas Graf <tgraf@suug.ch>
diff -Nru linux-2.6.10-rc1-bk11.orig/net/sched/ipt.c linux-2.6.10-rc1-bk11/net/sched/ipt.c
--- linux-2.6.10-rc1-bk11.orig/net/sched/ipt.c 2004-11-02 11:59:44.000000000 +0100
+++ linux-2.6.10-rc1-bk11/net/sched/ipt.c 2004-11-02 12:14:04.000000000 +0100
@@ -218,9 +218,8 @@
*/
p->tm.install = jiffies;
#ifdef CONFIG_NET_ESTIMATOR
- if (est) {
- qdisc_new_estimator(&p->stats, p->stats_lock, est);
- }
+ if (est)
+ gen_new_estimator(&p->bstats, &p->rate_est, p->stats_lock, est);
#endif
h = tcf_hash(p->index);
write_lock_bh(&ipt_lock);
@@ -258,8 +257,8 @@
spin_lock(&p->lock);
p->tm.lastuse = jiffies;
- p->stats.bytes += skb->len;
- p->stats.packets++;
+ p->bstats.bytes += skb->len;
+ p->bstats.packets++;
if (skb_cloned(skb) ) {
if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {
@@ -278,7 +277,7 @@
break;
case NF_DROP:
result = TC_ACT_SHOT;
- p->stats.drops++;
+ p->qstats.drops++;
break;
case IPT_CONTINUE:
result = TC_ACT_PIPE;
@@ -346,17 +345,6 @@
return -1;
}
-int
-tcf_ipt_stats(struct sk_buff *skb, struct tc_action *a)
-{
- struct tcf_ipt *p;
- p = PRIV(a,ipt);
- if (NULL != p)
- return qdisc_copy_stats(skb, &p->stats, p->stats_lock);
-
- return 1;
-}
-
struct tc_action_ops act_ipt_ops = {
.next = NULL,
.kind = "ipt",
@@ -364,7 +352,6 @@
.capab = TCA_CAP_NONE,
.owner = THIS_MODULE,
.act = tcf_ipt,
- .get_stats = tcf_ipt_stats,
.dump = tcf_ipt_dump,
.cleanup = tcf_ipt_cleanup,
.lookup = tcf_hash_search,
next prev parent reply other threads:[~2004-11-03 22:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-11-03 21:58 [PATCHSET 0/8] PKT_SCHED: Use gnet_stats for actions and policer Thomas Graf
2004-11-03 21:59 ` [PATCH 1/8] tcf_action: copy generic stats via TCA_ACT_STATS Thomas Graf
2004-11-03 21:59 ` [PATCH 2/8] gact: use gnet_stats for action stats Thomas Graf
2004-11-03 22:00 ` Thomas Graf [this message]
2004-11-03 22:01 ` [PATCH 4/8] mirred: " Thomas Graf
2004-11-03 22:01 ` [PATCH 5/8] pedit: " Thomas Graf
2004-11-03 22:02 ` [PATCH 6/8] police: use gnet_stats for action policer stats Thomas Graf
2004-11-03 22:02 ` [PATCH 7/8] police: use gnet_stats for old " Thomas Graf
2004-11-03 22:03 ` [PATCH 8/8] cls_*: use tcf_police_dump_stats to dump via new gnet_stats API Thomas Graf
2004-11-03 22:18 ` [PATCHSET 0/8] PKT_SCHED: Use gnet_stats for actions and policer David S. Miller
2004-11-04 0:43 ` Thomas Graf
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=20041103220026.GD12289@postel.suug.ch \
--to=tgraf@suug.ch \
--cc=davem@davemloft.net \
--cc=hadi@cyberus.ca \
--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).