diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-04-27 16:44:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-27 22:48:25 -0400 |
| commit | f3832ed2c27e7ad13300791db4089a7d4304f500 (patch) | |
| tree | 7b1e100e10bdc85bef0de5453fca5e93e910c8f2 | |
| parent | c2005eb01044e82498209ee4ee43be604da3ef2a (diff) | |
| download | blackbird-obmc-linux-f3832ed2c27e7ad13300791db4089a7d4304f500.tar.gz blackbird-obmc-linux-f3832ed2c27e7ad13300791db4089a7d4304f500.zip | |
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>
| -rw-r--r-- | include/net/ipv6.h | 4 | ||||
| -rw-r--r-- | net/ipv6/icmp.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 9f3b53f2819b..64ce3670d40a 100644 --- 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 823a1fc576e3..23b9a4cc418e 100644 --- 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: |
