net: snmp: kill STATS_BH macros

[deliverable/linux.git] / include / net / snmp.h

diff --git a/include/net/snmp.h b/include/net/snmp.h
index 56239fc05c51e75ae60c59df96febffa5af4cc75..6bdd255b22506b755410b625d5c76ae70dde0eb6 100644 (file)
--- a/include/net/snmp.h
+++ b/include/net/snmp.h
@@ -123,7 +123,7 @@ struct linux_xfrm_mib {
 #define DECLARE_SNMP_STAT(type, name)  \
        extern __typeof__(type) __percpu *name
 
-#define SNMP_INC_STATS_BH(mib, field)  \
+#define __SNMP_INC_STATS(mib, field)   \
                        __this_cpu_inc(mib->mibs[field])
 
 #define SNMP_INC_STATS_ATOMIC_LONG(mib, field) \
@@ -135,7 +135,7 @@ struct linux_xfrm_mib {
 #define SNMP_DEC_STATS(mib, field)     \
                        this_cpu_dec(mib->mibs[field])
 
-#define SNMP_ADD_STATS_BH(mib, field, addend)  \
+#define __SNMP_ADD_STATS(mib, field, addend)   \
                        __this_cpu_add(mib->mibs[field], addend)
 
 #define SNMP_ADD_STATS(mib, field, addend)     \
@@ -146,7 +146,7 @@ struct linux_xfrm_mib {
                this_cpu_inc(ptr[basefield##PKTS]);             \
                this_cpu_add(ptr[basefield##OCTETS], addend);   \
        } while (0)
-#define SNMP_UPD_PO_STATS_BH(mib, basefield, addend)   \
+#define __SNMP_UPD_PO_STATS(mib, basefield, addend)    \
        do { \
                __typeof__((mib->mibs) + 0) ptr = mib->mibs;    \
                __this_cpu_inc(ptr[basefield##PKTS]);           \
@@ -156,7 +156,7 @@ struct linux_xfrm_mib {
 
 #if BITS_PER_LONG==32
 
-#define SNMP_ADD_STATS64_BH(mib, field, addend)                        \
+#define __SNMP_ADD_STATS64(mib, field, addend)                                 \
        do {                                                            \
                __typeof__(*mib) *ptr = raw_cpu_ptr(mib);               \
                u64_stats_update_begin(&ptr->syncp);                    \
@@ -164,16 +164,16 @@ struct linux_xfrm_mib {
                u64_stats_update_end(&ptr->syncp);                      \
        } while (0)
 
-#define SNMP_ADD_STATS64(mib, field, addend)                   \
+#define SNMP_ADD_STATS64(mib, field, addend)                           \
        do {                                                            \
                preempt_disable();                                      \
-               SNMP_ADD_STATS64_BH(mib, field, addend);                \
+               __SNMP_ADD_STATS64(mib, field, addend);                 \
                preempt_enable();                                       \
        } while (0)
 
-#define SNMP_INC_STATS64_BH(mib, field) SNMP_ADD_STATS64_BH(mib, field, 1)
+#define __SNMP_INC_STATS64(mib, field) SNMP_ADD_STATS64(mib, field, 1)
 #define SNMP_INC_STATS64(mib, field) SNMP_ADD_STATS64(mib, field, 1)
-#define SNMP_UPD_PO_STATS64_BH(mib, basefield, addend)                 \
+#define __SNMP_UPD_PO_STATS64(mib, basefield, addend)                  \
        do {                                                            \
                __typeof__(*mib) *ptr;                          \
                ptr = raw_cpu_ptr((mib));                               \
@@ -185,17 +185,17 @@ struct linux_xfrm_mib {
 #define SNMP_UPD_PO_STATS64(mib, basefield, addend)                    \
        do {                                                            \
                preempt_disable();                                      \
-               SNMP_UPD_PO_STATS64_BH(mib, basefield, addend);         \
+               __SNMP_UPD_PO_STATS64(mib, basefield, addend);          \
                preempt_enable();                                       \
        } while (0)
 #else
-#define SNMP_INC_STATS64_BH(mib, field)                SNMP_INC_STATS_BH(mib, field)
+#define __SNMP_INC_STATS64(mib, field)         __SNMP_INC_STATS(mib, field)
 #define SNMP_INC_STATS64(mib, field)           SNMP_INC_STATS(mib, field)
 #define SNMP_DEC_STATS64(mib, field)           SNMP_DEC_STATS(mib, field)
-#define SNMP_ADD_STATS64_BH(mib, field, addend) SNMP_ADD_STATS_BH(mib, field, addend)
+#define __SNMP_ADD_STATS64(mib, field, addend) __SNMP_ADD_STATS(mib, field, addend)
 #define SNMP_ADD_STATS64(mib, field, addend)   SNMP_ADD_STATS(mib, field, addend)
 #define SNMP_UPD_PO_STATS64(mib, basefield, addend) SNMP_UPD_PO_STATS(mib, basefield, addend)
-#define SNMP_UPD_PO_STATS64_BH(mib, basefield, addend) SNMP_UPD_PO_STATS_BH(mib, basefield, addend)
+#define __SNMP_UPD_PO_STATS64(mib, basefield, addend) __SNMP_UPD_PO_STATS(mib, basefield, addend)
 #endif
 
 #endif