From d843013c7fcb6db4ac86a6bd15c3473e047d7b9a Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Mon, 14 Jul 2008 23:04:00 -0700 Subject: [PATCH] --- yaml --- r: 103541 b: refs/heads/master c: f66ac03d497c162c70cd0ccc802ce1777073cdf3 h: refs/heads/master i: 103539: 0e16eaf8f32784430b1258eee80f95fa9a77dcb0 v: v3 --- [refs] | 2 +- trunk/include/net/icmp.h | 2 +- trunk/net/ipv4/icmp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d68cb4dacaa5..0fa63ecbe2a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 903fc1964e746b8d8e2971ea20c89b7aeab8bd9a +refs/heads/master: f66ac03d497c162c70cd0ccc802ce1777073cdf3 diff --git a/trunk/include/net/icmp.h b/trunk/include/net/icmp.h index ee9c8d4b7ba4..03b9972b8754 100644 --- a/trunk/include/net/icmp.h +++ b/trunk/include/net/icmp.h @@ -34,7 +34,7 @@ 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(net, field) SNMP_INC_STATS(icmpmsg_statistics, field+256) -#define ICMPMSGIN_INC_STATS_BH(field) SNMP_INC_STATS_BH(icmpmsg_statistics, field) +#define ICMPMSGIN_INC_STATS_BH(net, field) SNMP_INC_STATS_BH(icmpmsg_statistics, field) struct dst_entry; struct net_proto_family; diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c index 6f4c65b898b4..ea60ad41008c 100644 --- a/trunk/net/ipv4/icmp.c +++ b/trunk/net/ipv4/icmp.c @@ -1012,7 +1012,7 @@ int icmp_rcv(struct sk_buff *skb) icmph = icmp_hdr(skb); - ICMPMSGIN_INC_STATS_BH(icmph->type); + ICMPMSGIN_INC_STATS_BH(net, icmph->type); /* * 18 is the highest 'known' ICMP type. Anything else is a mystery *