aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-07-06 00:19:20 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-06 00:19:20 -0400
commit235b9f7ac53489011d32efeb89e12e308fdd2c64 (patch)
tree8e808aa14ba4950a8a4e11f2e9386a0be867023d /net/ipv6
parent0283328e2360bbf3081e97f1b720dd4c4dbae111 (diff)
MIB: add struct net to UDP6_INC_STATS_USER
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>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/udp.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index f91e1df0d25e..833f715e4bff 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -166,7 +166,8 @@ try_again:
166 goto out_free; 166 goto out_free;
167 167
168 if (!peeked) 168 if (!peeked)
169 UDP6_INC_STATS_USER(UDP_MIB_INDATAGRAMS, is_udplite); 169 UDP6_INC_STATS_USER(sock_net(sk),
170 UDP_MIB_INDATAGRAMS, is_udplite);
170 171
171 sock_recv_timestamp(msg, sk, skb); 172 sock_recv_timestamp(msg, sk, skb);
172 173
@@ -213,7 +214,7 @@ out:
213csum_copy_err: 214csum_copy_err:
214 lock_sock(sk); 215 lock_sock(sk);
215 if (!skb_kill_datagram(sk, skb, flags)) 216 if (!skb_kill_datagram(sk, skb, flags))
216 UDP6_INC_STATS_USER(UDP_MIB_INERRORS, is_udplite); 217 UDP6_INC_STATS_USER(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
217 release_sock(sk); 218 release_sock(sk);
218 219
219 if (flags & MSG_DONTWAIT) 220 if (flags & MSG_DONTWAIT)
@@ -591,7 +592,8 @@ out:
591 up->len = 0; 592 up->len = 0;
592 up->pending = 0; 593 up->pending = 0;
593 if (!err) 594 if (!err)
594 UDP6_INC_STATS_USER(UDP_MIB_OUTDATAGRAMS, is_udplite); 595 UDP6_INC_STATS_USER(sock_net(sk),
596 UDP_MIB_OUTDATAGRAMS, is_udplite);
595 return err; 597 return err;
596} 598}
597 599
@@ -873,7 +875,8 @@ out:
873 * seems like overkill. 875 * seems like overkill.
874 */ 876 */
875 if (err == -ENOBUFS || test_bit(SOCK_NOSPACE, &sk->sk_socket->flags)) { 877 if (err == -ENOBUFS || test_bit(SOCK_NOSPACE, &sk->sk_socket->flags)) {
876 UDP6_INC_STATS_USER(UDP_MIB_SNDBUFERRORS, is_udplite); 878 UDP6_INC_STATS_USER(sock_net(sk),
879 UDP_MIB_SNDBUFERRORS, is_udplite);
877 } 880 }
878 return err; 881 return err;
879 882