diff --git a/[refs] b/[refs] index a18661e09de6..d68cb4dacaa5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcfc23cac103b54dbc00a6f52f47656ad5c75844 +refs/heads/master: 903fc1964e746b8d8e2971ea20c89b7aeab8bd9a diff --git a/trunk/include/net/icmp.h b/trunk/include/net/icmp.h index e2ae6409ff80..ee9c8d4b7ba4 100644 --- a/trunk/include/net/icmp.h +++ b/trunk/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/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c index 56a7bbc7950c..6f4c65b898b4 100644 --- a/trunk/net/ipv4/icmp.c +++ b/trunk/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); }