---

yaml --- r: 103538 b: refs/heads/master c: 75c939b h: refs/heads/master v: v3
git-mirror · Jul 15, 2008 · 1c0fe46 · 1c0fe46
1 parent 4f3b7b3
commit 1c0fe46
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43589aa93c9ce49f0e87a280014a4dd254b37fcf
+refs/heads/master: 75c939bb4d6da790f758a2a3dcc7432f6d8778ee
diff --git a/trunk/include/net/icmp.h b/trunk/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/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c
@@ -299,7 +299,7 @@ static inline int icmpv4_xrlim_allow(struct net *net, struct rtable *rt,
 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);
 }
 
 /*