mib: add struct net to ICMPMSGOUT_INC_STATS

xemul · davem330 · commit 903fc1964e74 · 2008-07-14T23:05:30.000-07:00
Signed-off-by: Pavel Emelyanov &lt;xemul@openvz.org&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/icmp.h b/include/net/icmp.h
@@ -33,7 +33,7 @@ DECLARE_SNMP_STAT(struct icmp_mib, icmp_statistics);
 DECLARE_SNMP_STAT(struct icmpmsg_mib, icmpmsg_statistics);
 #define ICMP_INC_STATS(net, field)	SNMP_INC_STATS(icmp_statistics, field)
 #define ICMP_INC_STATS_BH(net, field)	SNMP_INC_STATS_BH(icmp_statistics, field)
-#define ICMPMSGOUT_INC_STATS(field)	SNMP_INC_STATS(icmpmsg_statistics, field+256)
+#define ICMPMSGOUT_INC_STATS(net, field)	SNMP_INC_STATS(icmpmsg_statistics, field+256)
 #define ICMPMSGIN_INC_STATS_BH(field)	SNMP_INC_STATS_BH(icmpmsg_statistics, field)
 
 struct dst_entry;
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
@@ -298,7 +298,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);
+	ICMPMSGOUT_INC_STATS(net, type);
 	ICMP_INC_STATS(net, ICMP_MIB_OUTMSGS);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ static inline int icmpv4_xrlim_allow(struct net net, struct rtable rt,`
`298`	`298`	`*/`
`299`	`299`	`void icmp_out_count(struct net *net, unsigned char type)`
`300`	`300`	`{`
`301`		`- ICMPMSGOUT_INC_STATS(type);`
	`301`	`+ ICMPMSGOUT_INC_STATS(net, type);`
`302`	`302`	`ICMP_INC_STATS(net, ICMP_MIB_OUTMSGS);`
`303`	`303`	`}`
`304`	`304`