udp: prepare for non BH masking at backlog processing

UDP uses the generic socket backlog code, and this will soon
be changed to not disable BH when protocol is called back.

We need to use appropriate SNMP accessors.

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

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 093284c..f67f52b 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1514,9 +1514,9 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 
                /* Note that an ENOMEM error is charged twice */
                if (rc == -ENOMEM)
-                       __UDP_INC_STATS(sock_net(sk), UDP_MIB_RCVBUFERRORS,
+                       UDP_INC_STATS(sock_net(sk), UDP_MIB_RCVBUFERRORS,
                                        is_udplite);
-               __UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
+               UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
                kfree_skb(skb);
                trace_udp_fail_queue_rcv_skb(rc, sk);
                return -1;

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 1ba5a74..f911c63 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -570,9 +570,9 @@ static int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 
                /* Note that an ENOMEM error is charged twice */
                if (rc == -ENOMEM)
-                       __UDP6_INC_STATS(sock_net(sk),
+                       UDP6_INC_STATS(sock_net(sk),
                                         UDP_MIB_RCVBUFERRORS, is_udplite);
-               __UDP6_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
+               UDP6_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
                kfree_skb(skb);
                return -1;
        }