ipv6: kill ICMP6MSGIN_INC_STATS_BH()

IPv6 ICMP stats are atomics anyway.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 9f3b53f2819b84b194e6843e521db6be234b923f..64ce3670d40af32c327939942a88b6434c98b449 100644 (file)
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -184,9 +184,7 @@ extern int sysctl_mld_qrv;
 
 #define ICMP6MSGOUT_INC_STATS(net, idev, field)                \
        _DEVINC_ATOMIC_ATOMIC(net, icmpv6msg, idev, field +256)
-#define ICMP6MSGOUT_INC_STATS_BH(net, idev, field)     \
-       _DEVINC_ATOMIC_ATOMIC(net, icmpv6msg, idev, field +256)
-#define ICMP6MSGIN_INC_STATS_BH(net, idev, field)      \
+#define ICMP6MSGIN_INC_STATS(net, idev, field) \
        _DEVINC_ATOMIC_ATOMIC(net, icmpv6msg, idev, field)
 
 struct ip6_ra_chain {

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 823a1fc576e39149ebabe827f5a0ef0f3cedc8ca..23b9a4cc418eabf3f383975e3a0207255c72302c 100644 (file)
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -728,7 +728,7 @@ static int icmpv6_rcv(struct sk_buff *skb)
 
        type = hdr->icmp6_type;
 
-       ICMP6MSGIN_INC_STATS_BH(dev_net(dev), idev, type);
+       ICMP6MSGIN_INC_STATS(dev_net(dev), idev, type);
 
        switch (type) {
        case ICMPV6_ECHO_REQUEST: