1 files changed, 17 insertions, 5 deletions

diff --git a/include/net/snmp.h b/include/net/snmp.h
index a0e61806d480..479083a78b0c 100644
--- a/include/net/snmp.h
+++ b/include/net/snmp.h
@@ -60,9 +60,7 @@ struct ipstats_mib {
 };
 
 /* ICMP */
-#define ICMP_MIB_DUMMY  __ICMP_MIB_MAX
-#define ICMP_MIB_MAX    (__ICMP_MIB_MAX + 1)
-
+#define ICMP_MIB_MAX    __ICMP_MIB_MAX
 struct icmp_mib {
         unsigned long   mibs[ICMP_MIB_MAX];
 };
@@ -74,14 +72,24 @@ struct icmpmsg_mib {
 
 /* ICMP6 (IPv6-ICMP) */
 #define ICMP6_MIB_MAX   __ICMP6_MIB_MAX
+/* per network ns counters */
 struct icmpv6_mib {
         unsigned long   mibs[ICMP6_MIB_MAX];
 };
+/* per device counters, (shared on all cpus) */
+struct icmpv6_mib_device {
+        atomic_long_t   mibs[ICMP6_MIB_MAX];
+};
 
 #define ICMP6MSG_MIB_MAX  __ICMP6MSG_MIB_MAX
+/* per network ns counters */
 struct icmpv6msg_mib {
         unsigned long   mibs[ICMP6MSG_MIB_MAX];
 };
+/* per device counters, (shared on all cpus) */
+struct icmpv6msg_mib_device {
+        atomic_long_t   mibs[ICMP6MSG_MIB_MAX];
+};
 
 
 /* TCP */
@@ -116,6 +124,8 @@ struct linux_xfrm_mib {
  */ 
 #define DEFINE_SNMP_STAT(type, name)    \
         __typeof__(type) __percpu *name[2]
+#define DEFINE_SNMP_STAT_ATOMIC(type, name)     \
+        __typeof__(type) *name
 #define DECLARE_SNMP_STAT(type, name)   \
         extern __typeof__(type) __percpu *name[2]
 
@@ -126,6 +136,8 @@ struct linux_xfrm_mib {
                         __this_cpu_inc(mib[0]->mibs[field])
 #define SNMP_INC_STATS_USER(mib, field) \
                         this_cpu_inc(mib[1]->mibs[field])
+#define SNMP_INC_STATS_ATOMIC_LONG(mib, field)  \
+                        atomic_long_inc(&mib->mibs[field])
 #define SNMP_INC_STATS(mib, field)      \
                         this_cpu_inc(mib[!in_softirq()]->mibs[field])
 #define SNMP_DEC_STATS(mib, field)      \
@@ -152,7 +164,7 @@ struct linux_xfrm_mib {
 #define SNMP_UPD_PO_STATS_BH(mib, basefield, addend)    \
         do { \
                 __typeof__(*mib[0]) *ptr = \
-                        __this_cpu_ptr((mib)[!in_softirq()]); \
+                        __this_cpu_ptr((mib)[0]); \
                 ptr->mibs[basefield##PKTS]++; \
                 ptr->mibs[basefield##OCTETS] += addend;\
         } while (0)
@@ -204,7 +216,7 @@ struct linux_xfrm_mib {
 #define SNMP_UPD_PO_STATS64_BH(mib, basefield, addend)                  \
         do {                                                            \
                 __typeof__(*mib[0]) *ptr;                               \
-                ptr = __this_cpu_ptr((mib)[!in_softirq()]);             \
+                ptr = __this_cpu_ptr((mib)[0]);                         \
                 u64_stats_update_begin(&ptr->syncp);                    \
                 ptr->mibs[basefield##PKTS]++;                           \
                 ptr->mibs[basefield##OCTETS] += addend;                 \