Commit 235b9f7a authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

MIB: add struct net to UDP6_INC_STATS_USER 



As simple as the patch #1 in this set.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Acked-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0283328e

include/net/udp.h

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6); 
#define UDP6_INC_STATS_BH(field, is_udplite) 			      do  {  \

	if (is_udplite) SNMP_INC_STATS_BH(udplite_stats_in6, field);         \

	else		SNMP_INC_STATS_BH(udp_stats_in6, field);    } while(0)

#define UDP6_INC_STATS_USER(field, is_udplite)			       do {    \

#define UDP6_INC_STATS_USER(net, field, is_udplite)	    do { (void)net;    \

	if (is_udplite) SNMP_INC_STATS_USER(udplite_stats_in6, field);         \

	else		SNMP_INC_STATS_USER(udp_stats_in6, field);    } while(0)

net/ipv6/udp.c

+7 −4
Original line number Diff line number Diff line
@@ -166,7 +166,8 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk, 
		goto out_free;



	if (!peeked)

		UDP6_INC_STATS_USER(UDP_MIB_INDATAGRAMS, is_udplite);

		UDP6_INC_STATS_USER(sock_net(sk),

				UDP_MIB_INDATAGRAMS, is_udplite);



	sock_recv_timestamp(msg, sk, skb);
@@ -213,7 +214,7 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk, 
csum_copy_err:

	lock_sock(sk);

	if (!skb_kill_datagram(sk, skb, flags))

		UDP6_INC_STATS_USER(UDP_MIB_INERRORS, is_udplite);

		UDP6_INC_STATS_USER(sock_net(sk), UDP_MIB_INERRORS, is_udplite);

	release_sock(sk);



	if (flags & MSG_DONTWAIT)
@@ -591,7 +592,8 @@ static int udp_v6_push_pending_frames(struct sock *sk) 
	up->len = 0;

	up->pending = 0;

	if (!err)

		UDP6_INC_STATS_USER(UDP_MIB_OUTDATAGRAMS, is_udplite);

		UDP6_INC_STATS_USER(sock_net(sk),

				UDP_MIB_OUTDATAGRAMS, is_udplite);

	return err;

}
@@ -873,7 +875,8 @@ int udpv6_sendmsg(struct kiocb *iocb, struct sock *sk, 
	 * seems like overkill.

	 */

	if (err == -ENOBUFS || test_bit(SOCK_NOSPACE, &sk->sk_socket->flags)) {

		UDP6_INC_STATS_USER(UDP_MIB_SNDBUFERRORS, is_udplite);

		UDP6_INC_STATS_USER(sock_net(sk),

				UDP_MIB_SNDBUFERRORS, is_udplite);

	}

	return err;