lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MIB: add struct net to UDP6_INC_STATS_USER

Browse Source 
As simple as the patch #1 in this set.

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:
Pavel Emelyanov
2008-07-05 21:19:20 -07:00
committed by David S. Miller
parent 0283328e23
commit 235b9f7ac5
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/udp.h
View File

@@ -168,7 +168,7 @@ DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6);
#define UDP6_INC_STATS_BH(field, is_udplite) do { \ #define UDP6_INC_STATS_BH(field, is_udplite) do { \
if (is_udplite) SNMP_INC_STATS_BH(udplite_stats_in6, field); \ if (is_udplite) SNMP_INC_STATS_BH(udplite_stats_in6, field); \
else SNMP_INC_STATS_BH(udp_stats_in6, field); } while(0) 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); \ if (is_udplite) SNMP_INC_STATS_USER(udplite_stats_in6, field); \
else SNMP_INC_STATS_USER(udp_stats_in6, field); } while(0) else SNMP_INC_STATS_USER(udp_stats_in6, field); } while(0)

11
net/ipv6/udp.c
View File

@@ -166,7 +166,8 @@ try_again:
goto out_free; goto out_free;
if (!peeked) 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); sock_recv_timestamp(msg, sk, skb);
@@ -213,7 +214,7 @@ out:
csum_copy_err: csum_copy_err:
lock_sock(sk); lock_sock(sk);
if (!skb_kill_datagram(sk, skb, flags)) 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); release_sock(sk);
if (flags & MSG_DONTWAIT) if (flags & MSG_DONTWAIT)
@@ -591,7 +592,8 @@ out:
up->len = 0; up->len = 0;
up->pending = 0; up->pending = 0;
if (!err) 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; return err;
} }
@@ -873,7 +875,8 @@ out:
* seems like overkill. * seems like overkill.
*/ */
if (err == -ENOBUFS || test_bit(SOCK_NOSPACE, &sk->sk_socket->flags)) { 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; return err;