netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pavel Emelyanov <xemul@openvz.org>
To: David Miller <davem@davemloft.net>
Cc: Linux Netdev List <netdev@vger.kernel.org>
Subject: [PATCH net-next 4/7] MIB: add struct net to ICMP_INC_STATS
Date: Mon, 07 Jul 2008 14:51:24 +0400	[thread overview]
Message-ID: <4871F52C.1030001@openvz.org> (raw)
In-Reply-To: <4871F2D8.8030502@openvz.org>

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

---
 include/net/icmp.h |    2 +-
 net/ipv4/icmp.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/net/icmp.h b/include/net/icmp.h
index e34e981..c86fef8 100644
--- a/include/net/icmp.h
+++ b/include/net/icmp.h
@@ -31,7 +31,7 @@ struct icmp_err {
 extern struct icmp_err icmp_err_convert[];
 DECLARE_SNMP_STAT(struct icmp_mib, icmp_statistics);
 DECLARE_SNMP_STAT(struct icmpmsg_mib, icmpmsg_statistics);
-#define ICMP_INC_STATS(field)		SNMP_INC_STATS(icmp_statistics, field)
+#define ICMP_INC_STATS(net, field)	SNMP_INC_STATS(icmp_statistics, field)
 #define ICMP_INC_STATS_BH(field)	SNMP_INC_STATS_BH(icmp_statistics, field)
 #define ICMPMSGOUT_INC_STATS(field)	SNMP_INC_STATS(icmpmsg_statistics, field+256)
 #define ICMPMSGIN_INC_STATS_BH(field)	SNMP_INC_STATS_BH(icmpmsg_statistics, field)
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 56d6b94..e94de41 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -299,7 +299,7 @@ out:
 void icmp_out_count(struct net *net, unsigned char type)
 {
 	ICMPMSGOUT_INC_STATS(type);
-	ICMP_INC_STATS(ICMP_MIB_OUTMSGS);
+	ICMP_INC_STATS(net, ICMP_MIB_OUTMSGS);
 }
 
 /*
-- 
1.5.3.4


  parent reply	other threads:[~2008-07-07 10:53 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-07 10:41 [PATCH net-next 0/7] MIB: add struct net to ICMP accounting macros Pavel Emelyanov
2008-07-07 10:44 ` [PATCH net-next 1/7] ICMP: add struct net argument to icmp_out_count Pavel Emelyanov
2008-07-15  6:01   ` David Miller
2008-07-07 10:47 ` [PATCH net-next 2/7] INET: toss struct net initialization around Pavel Emelyanov
2008-07-15  6:01   ` David Miller
2008-07-07 10:50 ` [PATCH net-next 3/7] ICMP: drop unused MIB accounting wrappers Pavel Emelyanov
2008-07-15  6:02   ` David Miller
2008-07-07 10:51 ` Pavel Emelyanov [this message]
2008-07-15  6:02   ` [PATCH net-next 4/7] MIB: add struct net to ICMP_INC_STATS David Miller
2008-07-07 10:52 ` [PATCH net-next 5/7] MIB: add struct net to ICMP_INC_STATS_BH Pavel Emelyanov
2008-07-15  6:03   ` David Miller
2008-07-07 10:53 ` [PATCH net-next 6/7] MIB: add struct net to ICMPMSGOUT_INC_STATS Pavel Emelyanov
2008-07-15  6:03   ` David Miller
2008-07-07 10:53 ` [PATCH net-next 7/7] MIB: add struct net to ICMPMSGIN_INC_STATS_BH Pavel Emelyanov
2008-07-15  6:04   ` David 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=4871F52C.1030001@openvz.org \
    --to=xemul@openvz.org \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    /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).