mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
MIB: add struct net to UDP_INC_STATS_USER
Nothing special - all the places already have a struct sock at hands, so use the sock_net() net. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Acked-by: Denis V. Lunev <den@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
4ce2417bfb
commit
629ca23c33
2 changed files with 8 additions and 5 deletions
|
@ -158,7 +158,7 @@ DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6);
|
|||
/*
|
||||
* SNMP statistics for UDP and UDP-Lite
|
||||
*/
|
||||
#define UDP_INC_STATS_USER(field, is_udplite) do { \
|
||||
#define UDP_INC_STATS_USER(net, field, is_udplite) do { (void)net; \
|
||||
if (is_udplite) SNMP_INC_STATS_USER(udplite_statistics, field); \
|
||||
else SNMP_INC_STATS_USER(udp_statistics, field); } while(0)
|
||||
#define UDP_INC_STATS_BH(field, is_udplite) do { \
|
||||
|
|
|
@ -526,7 +526,8 @@ static int udp_push_pending_frames(struct sock *sk)
|
|||
up->len = 0;
|
||||
up->pending = 0;
|
||||
if (!err)
|
||||
UDP_INC_STATS_USER(UDP_MIB_OUTDATAGRAMS, is_udplite);
|
||||
UDP_INC_STATS_USER(sock_net(sk),
|
||||
UDP_MIB_OUTDATAGRAMS, is_udplite);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -725,7 +726,8 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
|||
* seems like overkill.
|
||||
*/
|
||||
if (err == -ENOBUFS || test_bit(SOCK_NOSPACE, &sk->sk_socket->flags)) {
|
||||
UDP_INC_STATS_USER(UDP_MIB_SNDBUFERRORS, is_udplite);
|
||||
UDP_INC_STATS_USER(sock_net(sk),
|
||||
UDP_MIB_SNDBUFERRORS, is_udplite);
|
||||
}
|
||||
return err;
|
||||
|
||||
|
@ -888,7 +890,8 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
|||
goto out_free;
|
||||
|
||||
if (!peeked)
|
||||
UDP_INC_STATS_USER(UDP_MIB_INDATAGRAMS, is_udplite);
|
||||
UDP_INC_STATS_USER(sock_net(sk),
|
||||
UDP_MIB_INDATAGRAMS, is_udplite);
|
||||
|
||||
sock_recv_timestamp(msg, sk, skb);
|
||||
|
||||
|
@ -917,7 +920,7 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
|||
csum_copy_err:
|
||||
lock_sock(sk);
|
||||
if (!skb_kill_datagram(sk, skb, flags))
|
||||
UDP_INC_STATS_USER(UDP_MIB_INERRORS, is_udplite);
|
||||
UDP_INC_STATS_USER(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
|
||||
release_sock(sk);
|
||||
|
||||
if (noblock)
|
||||
|
|
Loading…
Reference in a new issue