Inicio Explorar Axuda
Iniciar sesión
GfA
/
linux_kernel
5
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

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>
Eric Dumazet %!s(int64=9) %!d(string=hai) anos
pai
c2005eb010
achega
f3832ed2c2
Modificáronse 2 ficheiros con 2 adicións e 4 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 1 3
      include/net/ipv6.h
  2. 1 1
      net/ipv6/icmp.c

+ 1 - 3
include/net/ipv6.h
Ver ficheiro 

@@ -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 {

+ 1 - 1
net/ipv6/icmp.c
Ver ficheiro 

@@ -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: